diff --git a/.gitignore b/.gitignore
index 9b94286..f5f70b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/digikam-1.8.0.tar.bz2
+/digikam-1.9.0.tar.bz2
diff --git a/digikam-1.8.0-libjpeg_version-2.patch b/digikam-1.8.0-libjpeg_version-2.patch
new file mode 100644
index 0000000..22aed7e
--- /dev/null
+++ b/digikam-1.8.0-libjpeg_version-2.patch
@@ -0,0 +1,38 @@
+diff -up digikam-1.8.0/CMakeLists.txt.libjpeg_version digikam-1.8.0/CMakeLists.txt
+--- digikam-1.8.0/CMakeLists.txt.libjpeg_version	2011-01-23 13:33:57.000000000 -0600
++++ digikam-1.8.0/CMakeLists.txt	2011-02-04 11:34:22.712549338 -0600
+@@ -151,17 +151,23 @@ ELSE(NOT APPLE)
+     SET(CLAPACK_FOUND FALSE)
+ ENDIF(NOT APPLE)
+ 
+-# Extract version of libjpeg so that we can use the appropriate dir
+-# See bug #227313, #228483
+-FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
+-STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+-MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
+-
+-IF ("${jpeglib_version}" LESS 80)
+-    SET(DIGIKAM_LIBJPEG_DIR libjpeg-62)
+-ELSE ("${jpeglib_version}" LESS 80)
+-    SET(DIGIKAM_LIBJPEG_DIR libjpeg-80)
+-ENDIF ("${jpeglib_version}" LESS 80)
++# check version of libjpeg so that we can use the appropriate dir
++# See bug #227313
++set(_jpeglib_version_source "#include <stddef.h>\n#include<stdio.h>\n#include <jpeglib.h>\n int main()\n {\n #if (JPEG_LIB_VERSION >= 80) \n #error JPEG_LIB_VERSION >= 80 found \n #endif \n }\n")
++set(_jpeglib_version_source_file ${CMAKE_BINARY_DIR}/CMakeTmp/cmake_jpeglib_version_check.cpp)
++file(WRITE "${_jpeglib_version_source_file}" "${_jpeglib_version_source}")
++set(_jpeglib_version_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${JPEG_INCLUDE_DIR}")
++
++try_compile(_jpeglib_version_compile_result ${CMAKE_BINARY_DIR} ${_jpeglib_version_source_file} CMAKE_FLAGS "${_jpeglib_version_include_dirs}" COMPILE_OUTPUT_VARIABLE _jpeglib_version_compile_output_var)
++
++if(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 62")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-62)
++else(_jpeglib_version_compile_result)
++MESSAGE(STATUS "Identified libjpeg version: 80+")
++set(DIGIKAM_LIBJPEG_DIR libjpeg-80)
++endif(_jpeglib_version_compile_result)
++
+ 
+ # Check KDcraw version installed to compile fine.
+ IF(NOT WIN32)
diff --git a/digikam-1.8.0-libjpeg_version-3.patch b/digikam-1.8.0-libjpeg_version-3.patch
new file mode 100644
index 0000000..1e2c590
--- /dev/null
+++ b/digikam-1.8.0-libjpeg_version-3.patch
@@ -0,0 +1,11 @@
+diff -up digikam-1.8.0/CMakeLists.txt.libjpeg_version digikam-1.8.0/CMakeLists.txt
+--- digikam-1.8.0/CMakeLists.txt.libjpeg_version	2011-01-23 13:33:57.000000000 -0600
++++ digikam-1.8.0/CMakeLists.txt	2011-02-04 12:17:54.102537201 -0600
+@@ -154,6 +154,7 @@ ENDIF(NOT APPLE)
+ # Extract version of libjpeg so that we can use the appropriate dir
+ # See bug #227313, #228483
+ FILE(READ "${JPEG_INCLUDE_DIR}/jpeglib.h" jpeglib_h_content)
++FILE(READ "${JPEG_INCLUDE_DIR}/jconfig.h" jpeglib_h_content)
+ STRING(REGEX REPLACE ".*#define +JPEG_LIB_VERSION +([0-9]+).*" "\\1" jpeglib_version "${jpeglib_h_content}")
+ MESSAGE(STATUS "Identified libjpeg version: ${jpeglib_version}")
+ 
diff --git a/digikam.spec b/digikam.spec
index 82bfadb..be8d2a0 100644
--- a/digikam.spec
+++ b/digikam.spec
@@ -1,6 +1,6 @@
 
 Name:	 digikam
-Version: 1.8.0
+Version: 1.9.0
 Release: 1%{?dist}
 Summary: A digital camera accessing & photo management application
 
@@ -16,8 +16,11 @@ Source1: digikam-import.desktop
 
 ## upstreamable patches
 Patch50: digikam-1.4.0_marble_plugin_rpath.patch
-# fix for libjpeg-turbo, needs love
+# fix for libjpeg-turbo,  see https://bugs.kde.org/show_bug.cgi?id=265431 
+# hardcode libjpeg-62
 Patch51: digikam-1.8.0-libjpeg_version.patch
+# use try-compile test
+Patch52: digikam-1.8.0-libjpeg_version-2.patch
 
 ## upstream patches
 
@@ -85,7 +88,7 @@ needed to develop applications using %{name}.
 %setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 
 %patch50 -p1 -b .marble_plugin_rpath
-%patch51 -p1 -b .libjpeg_version
+%patch52 -p1 -b .libjpeg_version
 
 
 %build
@@ -169,6 +172,15 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Mar 17 2011 Rex Dieter <rdieter@fedoraproject.org> 1.9.0-1
+- 1.9.0
+
+* Thu Mar 03 2011 Rex Dieter <rdieter@fedoraproject.org> 1.8.0-3
+- use safer check for libjpeg version, using cmake_try_compile (kde#265431)
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Thu Feb 03 2011 Rex Dieter <rdieter@fedoraproject.org> 1.8.0-1
 - 1.8.0
 
diff --git a/sources b/sources
index 6862d23..3d33109 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-54aa6150183621cabd5ea222d55685a4  digikam-1.8.0.tar.bz2
+08934e97b63e8b1981f4087ec1a3372e  digikam-1.9.0.tar.bz2