diff --git a/mapserver.spec b/mapserver.spec
index c82927a..3ec6924 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -17,6 +17,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%bcond_with ruby
 
 #
 %define libname libmapserver2
@@ -66,6 +67,9 @@ BuildRequires:  openjpeg2-devel
 BuildRequires:  pam
 BuildRequires:  pam-devel
 BuildRequires:  postgresql-devel >= 9.1
+%if 0%{?suse_version} >= 1510
+BuildRequires:  postgresql-server-devel >= 9.1
+%endif
 BuildRequires:  proj
 BuildRequires:  libprotobuf-c-devel
 BuildRequires:  protobuf-c
@@ -169,6 +173,7 @@ Obsoletes:      mapserver-java < %{version}-%{release}
 The Java/Mapscript extension provides full map customization capabilities
 within the Java programming language.
 
+%if %{with ruby}
 %package -n ruby-mapscript
 Summary:        Ruby/Mapscript map making extensions to Ruby
 Group:          Development/Languages/Ruby
@@ -182,6 +187,7 @@ Obsoletes:      mapserver-ruby < %{version}-%{release}
 %description -n ruby-mapscript
 The Ruby/Mapscript extension provides full map customization capabilities
 within the Ruby programming language.
+%endif
 
 %package        devel
 Summary:        Mapserver development files
@@ -240,7 +246,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
         -DWITH_PROJ=TRUE \
         -DWITH_PROTOBUFC=TRUE \
         -DWITH_PYTHON=TRUE \
+%if %{with ruby}
         -DWITH_RUBY=TRUE \
+%endif
         -DWITH_SOS=TRUE \
         -DWITH_THREAD_SAFETY=TRUE \
         -DWITH_WCS=TRUE \
@@ -356,7 +364,7 @@ rm -rf %{buildroot}
 
 %files -n python-mapscript
 %defattr(-,root,root)
-%doc mapscript/python/README
+%doc mapscript/python/README.rst
 %doc mapscript/python/examples
 %doc mapscript/python/tests
 %{python_sitearch}/*
@@ -368,11 +376,13 @@ rm -rf %{buildroot}
 %doc mapscript/java/tests
 %{_libdir}/libjavamapscript.so
 
+%if %{with ruby}
 %files -n ruby-mapscript
 %defattr(-,root,root)
 %doc mapscript/ruby/README
 %doc mapscript/ruby/examples
 %{rb_sitearchdir}/mapscript.so
+%endif
 
 %files devel
 %defattr(-,root,root)