diff --git a/qgis-1.6.0-sip.patch b/qgis-1.6.0-sip.patch
new file mode 100644
index 0000000..a8264f4
--- /dev/null
+++ b/qgis-1.6.0-sip.patch
@@ -0,0 +1,42 @@
+--- qgis-1.6.0/python/core/conversions.sip	2010-10-03 11:11:28.000000000 +0200
++++ qgis-1.6.0_sip/python/core/conversions.sip	2011-02-02 15:15:46.725572147 +0100
+@@ -15,6 +15,7 @@
+ */
+ 
+ %Feature QSETINT_CONVERSION
++%Feature QSETTYPE_CONVERSION
+ 
+ %ModuleHeaderCode
+ // From Python 2.5, some functions use Py_ssize_t instead of int
+@@ -320,7 +321,7 @@
+ };
+ %End
+ 
+-
++%If (QSETTYPE_CONVERSION)
+ template <TYPE>
+ %MappedType QSet<TYPE>
+ {
+@@ -394,8 +395,7 @@
+ %End
+ 
+ };
+-
+-
++%End
+ 
+ template<TYPE>
+ %MappedType QMap<int, QMap<int, TYPE> >
+--- qgis-1.6.0/python/CMakeLists.txt	2010-10-04 22:05:12.000000000 +0200
++++ qgis-1.6.0_sip/python/CMakeLists.txt	2011-02-02 15:15:46.725572147 +0100
+@@ -43,6 +43,10 @@
+   SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETINT_CONVERSION)
+ ENDIF(NOT PYQT4_VERSION_NUM LESS 263941)
+ 
++IF(NOT PYQT4_VERSION_NUM LESS 264194)	# 0x040802
++  SET(SIP_DISABLE_FEATURES ${SIP_DISABLE_FEATURES} QSETTYPE_CONVERSION)
++ENDIF(NOT PYQT4_VERSION_NUM LESS 264194)
++
+ # core module
+ FILE(GLOB sip_files_core core/*.sip)
+ set(SIP_EXTRA_FILES_DEPEND ${sip_files_core})
diff --git a/qgis.spec b/qgis.spec
index 479a27f..3db1e00 100644
--- a/qgis.spec
+++ b/qgis.spec
@@ -4,19 +4,20 @@
 
 Name:           qgis
 Version:        1.6.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 
 Group:          Applications/Engineering
 License:        GPLv2+ with exceptions
 URL:            http://www.qgis.org/
-#Source0:        http://download.osgeo.org/qgis/src/%{name}_%{version}.tar.gz
 Source0:        http://qgis.org/~timlinux/src/%{name}_%{version}.tar.gz
 Source1:        %{name}.desktop
 
 # Fix detection problem for GRASS libraries
 # Proposed changes for next version: https://trac.osgeo.org/qgis/ticket/2863
 Patch0: qgis-1.5.0-grass.patch
+# Fix problem with SIP 4.12, see https://trac.osgeo.org/qgis/changeset/14988
+Patch1: qgis-1.6.0-sip.patch
 
 BuildRequires:  cmake
 BuildRequires:  flex bison
@@ -26,6 +27,7 @@ BuildRequires:  gdal-devel
 BuildRequires:  geos-devel
 BuildRequires:  gsl-devel
 BuildRequires:  postgresql-devel
+BuildRequires:  libspatialite-devel
 BuildRequires:  proj-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  chrpath
@@ -95,6 +97,7 @@ Python integration and plugins for QGIS.
 %setup -q
 
 %patch0 -p1 -b .grass
+%patch1 -p1 -b .sip
 
 # Encode man-file to utf-8
 iconv -f iso8859-1 -t utf-8 qgis_help.1 > qgis_help.1.conv && mv qgis_help.1.conv qgis_help.1
@@ -112,17 +115,19 @@ GRASS_PREFIX=%{_libdir}
       -D QGIS_LIB_SUBDIR=%{_lib} \
       -D QGIS_MANUAL_SUBDIR=/share/man \
       -D QGIS_PLUGIN_SUBDIR=%{_lib}/%{name} \
-      -D QGIS_CGIBIN_SUBDIR=%{_var}/www/cgi-bin \
+      -D QGIS_CGIBIN_SUBDIR=%{_libexecdir}/%{name} \
       -D WITH_BINDINGS:BOOL=TRUE \
       -D BINDINGS_GLOBAL_INSTALL:BOOL=TRUE \
       -D GRASS_PREFIX=$GRASS_PREFIX \
       -D GDAL_INCLUDE_DIR=%{_includedir}/gdal \
       -D GDAL_LIBRARY=%{_libdir}/libgdal.so \
       .
+# QGIS Mapserver will be off by default in 1.7
 
 # Parallel make leads to race conditions with PYQT4_WRAP_UI
-#make %{?_smp_mflags}
-make
+# https://trac.osgeo.org/qgis/ticket/2880
+make %{?_smp_mflags}
+#make
 
 %install
 rm -rf %{buildroot}
@@ -175,10 +180,8 @@ rm -rf %{buildroot}
 %{_libdir}/lib%{name}_*.so.*
 %{_libdir}/%{name}/
 %{_bindir}/qgis*
-%{_var}/www/cgi-bin/admin.sld
-%{_var}/www/cgi-bin/wms_metadata.xml
-%{_var}/www/cgi-bin/qgis_mapserv.fcgi
 %{_mandir}/man1/%{name}*
+%{_libexecdir}/%{name}
 %dir %{_datadir}/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/applications/fedora-%{name}.desktop
@@ -188,14 +191,10 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}/resources
 %{_datadir}/%{name}/svg
 %{_datadir}/%{name}/themes
-%exclude %{_libdir}/libqgisgrass.so.%{version}
-%exclude %{_libdir}/%{name}/libgrassprovider.so
-%exclude %{_libdir}/%{name}/libgrassrasterprovider.so
-%exclude %{_libdir}/%{name}/libgrassplugin.so
+%exclude %{_libdir}/%{name}/*grass*
 %exclude %{_datadir}/%{name}/themes/default/grass
 %exclude %{_datadir}/%{name}/themes/gis/grass
 %exclude %{_datadir}/%{name}/themes/classic/grass
-%exclude %{_libdir}/%{name}/grass
 
 %files devel
 %defattr(-,root,root,-)
@@ -207,9 +206,7 @@ rm -rf %{buildroot}
 %files grass
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}grass.so.%{version}
-%{_libdir}/%{name}/libgrassprovider.so
-%{_libdir}/%{name}/libgrassrasterprovider.so
-%{_libdir}/%{name}/libgrassplugin.so
+%{_libdir}/%{name}/libgrass*.so
 %{_libdir}/%{name}/grass
 %{_datadir}/%{name}/grass
 %{_datadir}/%{name}/themes/default/grass
@@ -224,6 +221,11 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Wed Feb 02 2011 Volker Fröhlich <volker27@gmx.at> - 1.6.0-4
+- Patch for SIP 4.12
+- Changed path for QGIS mapserver
+- Simplified files section
+
 * Wed Nov 24 2010 Volker Fröhlich <volker27@gmx.at> - 1.6.0-3
 - Rebuild for GRASS 6.4