diff --git a/digikam-2.0.0.tar.bz2 b/digikam-2.0.0.tar.bz2
deleted file mode 100644
index 06aefed..0000000
--- a/digikam-2.0.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
-size 53906557
diff --git a/digikam-2.1.0.tar.bz2 b/digikam-2.1.0.tar.bz2
new file mode 100644
index 0000000..04789e1
--- /dev/null
+++ b/digikam-2.1.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33b35c85b3f7820771a05f4a4e3f22961bbab6402e5159d07c2080158d55cba7
+size 53911470
diff --git a/digikam-external-libs.patch b/digikam-external-libs.patch
index c5ad249..82fc674 100644
--- a/digikam-external-libs.patch
+++ b/digikam-external-libs.patch
@@ -1,13 +1,14 @@
---- CMakeLists.txt	2011-07-28 01:31:23.000000000 +0200
-+++ CMakeLists.txt	2011-07-28 11:48:51.084119958 +0200
-@@ -73,11 +73,6 @@
+--- CMakeLists.txt.orig	2011-09-07 14:10:20.000000000 +0200
++++ CMakeLists.txt	2011-09-09 15:30:52.649954215 +0200
+@@ -79,12 +79,8 @@
      SET(KSANE_LOCAL_DIR extra/libksane)
  ENDIF()
  
 -SET(KFACE_LOCAL_DIR extra/libkface)
 -SET(KGEOMAP_LOCAL_DIR extra/libkgeomap)
 -SET(MEDIAWIKI_LOCAL_DIR extra/libmediawiki)
--
+ SET(LIBKVKONTAKTE_LOCAL_DIR extra/libkvkontakte)
+
 -ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(core)
  ADD_SUBDIRECTORY(doc)
diff --git a/digikam-link-order.patch b/digikam-link-order.patch
deleted file mode 100644
index 09edc3c..0000000
--- a/digikam-link-order.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- core/digikam/CMakeLists.txt	2011-07-28 01:28:25.000000000 +0200
-+++ core/digikam/CMakeLists.txt	2011-08-26 10:10:07.010025844 +0200
-@@ -278,13 +278,14 @@
- 
-         ${STRIGI_LIBRARIES}
-         ${LCMS_LIBRARIES}
--        ${GPHOTO2_LIBRARIES}
- 
-         digikamcore
-         digikamdatabase
-         advancedrename
-         queuemanager
-         cameragui
-+
-+        ${GPHOTO2_LIBRARIES}
- )
- 
- IF (NOT WIN32 AND GPHOTO2_FOUND)
diff --git a/digikam.changes b/digikam.changes
index 4e81469..e0f9a56 100644
--- a/digikam.changes
+++ b/digikam.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Sun Sep 11 17:03:43 UTC 2011 - idonmez@suse.com
+
+- Add disable-unsupported-cmake-policy.patch to remove unsupported
+  cmake policy setup, fixes openSUSE 11.4 build
+
+-------------------------------------------------------------------
+Fri Sep  9 13:10:04 UTC 2011 - adrian@suse.de
+
+- update to version 2.1.0
+  * Mainly bug fix release
+  * CameraGUI improvements
+- new libkvkontakte may need to be splitted into own package as well
+
 -------------------------------------------------------------------
 Mon Sep  5 08:16:18 UTC 2011 - coolo@suse.com
 
diff --git a/digikam.spec b/digikam.spec
index 9cf023c..b189481 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -18,7 +18,7 @@
 
 
 Name:           digikam
-Version:        2.0.0
+Version:        2.1.0
 Release:        7
 License:        GPL-2.0+
 Summary:        A KDE Photo Manager
@@ -31,8 +31,8 @@ Patch0:         digikam-buildtime.patch
 Patch1:         add_mimetype_bnc629393.diff
 # PATCH-FIX-OPENSUSE digikam-external-libs.patch -- Compile with external libs
 Patch2:         digikam-external-libs.patch
-# PATCH-FIX-UPSTREAM digikam-link-order.patch bko #258931 idoenmez@suse.de -- Fix library link order
-Patch3:         digikam-link-order.patch
+# PATCH-FIX-OPENSUSE disable-unsupported-cmake-policy.patch idoenmez@suse.de -- Remove unsupported cmake policy
+Patch3:         disable-unsupported-cmake-policy.patch
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
diff --git a/disable-unsupported-cmake-policy.patch b/disable-unsupported-cmake-policy.patch
new file mode 100644
index 0000000..7c27b14
--- /dev/null
+++ b/disable-unsupported-cmake-policy.patch
@@ -0,0 +1,14 @@
+--- CMakeLists.txt	2011-09-07 14:10:20.000000000 +0200
++++ CMakeLists.txt	2011-09-11 19:03:11.217931980 +0200
+@@ -24,11 +24,6 @@
+ 
+ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+ 
+-if(POLICY CMP0011)
+-   cmake_policy(SET CMP0017 NEW)
+-endif(POLICY CMP0011)
+-
+-
+ PROJECT(digikam-sc)
+ 
+ IF(KDE4_BUILD_TESTS)