diff --git a/.gitignore b/.gitignore
index 8aa387f..2556e28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ openwsman-2.2.3.tar.bz2
 /openwsman-2.2.5.tar.bz2
 /openwsman-2.2.7.tar.bz2
 /openwsman-2.3.0.tar.bz2
+/openwsman-2.3.5.tar.bz2
diff --git a/openwsman.spec b/openwsman.spec
index 7694600..566629f 100644
--- a/openwsman.spec
+++ b/openwsman.spec
@@ -3,19 +3,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"] ')}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
+%{!?ruby_sitelib: %global ruby_sitelib %(ruby -r rbconfig -e 'vd = RbConfig::CONFIG["vendorlibdir"]; print(vd ? vd : RbConfig::CONFIG["sitelibdir"])')}
+%{!?ruby_sitearch: %global ruby_sitearch %(ruby -r rbconfig -e 'vad = RbConfig::CONFIG["vendorarchdir"]; print(vad ? vad : RbConfig::CONFIG["sitearchdir"])')}
 
 Name:           openwsman
 BuildRequires:  swig
 BuildRequires:  libcurl-devel libxml2-devel pam-devel sblim-sfcc-devel
-#BuildRequires:  python python-devel ruby ruby-devel rubygem(rdoc) perl
+BuildRequires:  python python-devel ruby ruby-devel rubygem(rdoc) perl
 BuildRequires:  python python-devel perl
 BuildRequires:  perl-devel pkgconfig openssl-devel
 BuildRequires:  cmake
 BuildRequires:  systemd-units
-Version:        2.3.0
-Release:        7%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Url:            http://www.openwsman.org/
 License:        BSD
 Group:          Applications/System
@@ -28,8 +28,7 @@ Source2:        openwsmand.service
 # script for testing presence of the certificates in ExecStartPre
 Source3:        owsmantestcert.sh
 Patch0:         %{name}-sitelibdir.patch
-Patch2:         openwsman-2.2.7-disable-ruby.patch
-Patch3:         openwsman-2.2.7-libssl.patch
+Patch1:         openwsman-2.2.7-libssl.patch
 
 %description
 Openwsman is a project intended to provide an open-source
@@ -112,15 +111,15 @@ API.
 
 
 
-#%package ruby
-#License:        BSD
-#Group:          Development/Libraries
-#Requires:       ruby
-#Requires:       ruby(abi) = 1.9.1
-#Summary:        Ruby bindings for openwsman client API
-#
-#%description ruby
-#This package provides Ruby bindings to access the openwsman client API.
+%package ruby
+License:        BSD
+Group:          Development/Libraries
+Requires:       ruby
+Requires:       ruby(abi) = 1.9.1
+Summary:        Ruby bindings for openwsman client API
+
+%description ruby
+This package provides Ruby bindings to access the openwsman client API.
 
 
 
@@ -141,8 +140,7 @@ This package provides Perl bindings to access the openwsman client API.
 %setup -q
 # don't make backup of file patched by patch0, it'll be installed...
 %patch0 -p1
-%patch2 -p1
-%patch3 -p1 -b .libssl
+%patch1 -p1 -b .libssl
 
 %build
 # Removing executable permissions on .c and .h files to fix rpmlint warnings. 
@@ -163,6 +161,7 @@ cmake \
   -DCMAKE_SKIP_RPATH=1 \
   -DPACKAGE_ARCHITECTURE=`uname -m` \
   -DLIB=%{_lib} \
+  -DBUILD_RUBY_GEM=no \
    ..
 
 make CFLAGS="-DSSL_LIB='\"$SSL_LIB\"'"
@@ -231,12 +230,11 @@ rm -f /var/log/wsmand.log
 %{python_sitearch}/*.pyo
 %doc AUTHORS COPYING ChangeLog README.md
 
-#%files ruby
-#%{ruby_sitearch}/openwsman.so
-#%{ruby_sitearch}/_openwsman.so
-#%dir %{ruby_sitelib}/openwsman
-#%{ruby_sitelib}/openwsman/*.rb
-#%doc AUTHORS COPYING ChangeLog README.md
+%files ruby
+%{ruby_sitearch}/_openwsman.so
+%dir %{ruby_sitelib}/openwsman
+%{ruby_sitelib}/openwsman/*.rb
+%doc AUTHORS COPYING ChangeLog README.md
 
 %files perl
 %{perl_vendorarch}/openwsman.so
@@ -272,6 +270,10 @@ rm -f /var/log/wsmand.log
 
 
 %changelog
+* Mon Sep 17 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.5-1
+- Update to openwsman-2.3.5
+- Enable ruby subpackage again
+
 * Tue Aug 28 2012 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.3.0-7
 - Fix issues found by fedora-review utility in the spec file
 
diff --git a/sources b/sources
index e8abf27..6c726a8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ec34cb43a3d73398e088539d788debd2  openwsman-2.3.0.tar.bz2
+555cf08a7252cff5799d81e102f571d4  openwsman-2.3.5.tar.bz2