diff --git a/digikam-link-order.patch b/digikam-link-order.patch
new file mode 100644
index 0000000..09edc3c
--- /dev/null
+++ b/digikam-link-order.patch
@@ -0,0 +1,18 @@
+--- 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 c7bc670..6ad1a7d 100644
--- a/digikam.changes
+++ b/digikam.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Aug 26 08:18:51 UTC 2011 - idonmez@novell.com
+
+ - Add digikam-link-order.patch: fix library link order,
+   bko #258931
+
 -------------------------------------------------------------------
 Mon Aug  8 22:40:46 UTC 2011 - asterios.dramis@gmail.com
 
diff --git a/digikam.spec b/digikam.spec
index da872c4..f09183e 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -31,6 +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
 BuildRequires:  boost-devel
 BuildRequires:  doxygen
 BuildRequires:  fdupes
@@ -42,8 +44,8 @@ BuildRequires:  libkde4-devel
 BuildRequires:  libkdepimlibs4-devel
 BuildRequires:  libkexiv2-devel
 BuildRequires:  libkface-devel
-BuildRequires:  libkipi-devel
 BuildRequires:  libkgeomap-devel
+BuildRequires:  libkipi-devel
 BuildRequires:  liblcms-devel
 BuildRequires:  liblqr-devel
 BuildRequires:  libsoprano-devel
@@ -74,6 +76,7 @@ rm po/*/kipi*
 %patch0
 %patch1
 %patch2
+%patch3
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')