diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa3159344..8cd43729f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ endif (APPLE)
 
 option (BUILD_SHARED "Build rawtherapee with shared libraries" OFF)
 option (WITH_RAWZOR "Build with Rawzor support" OFF)
+option (OPTION_OMP "Build with OpenMP support" ON)
 
 # set install directories
 if (NOT DEFINED DATADIR)
@@ -116,10 +117,12 @@ if (WITH_RAWZOR)
     endif (WIN32)
 endif (WITH_RAWZOR)
 
-find_package(OpenMP)
-if (OPENMP_FOUND)
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-endif (OPENMP_FOUND)
+if (OPTION_OMP)
+	find_package(OpenMP)
+	if (OPENMP_FOUND)
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+	endif (OPENMP_FOUND)
+endif (OPTION_OMP)
 
 add_subdirectory (rtexif)
 add_subdirectory (rtengine)
diff --git a/COMPILE.txt b/COMPILE.txt
index 3eabff19a..e4620718d 100644
--- a/COMPILE.txt
+++ b/COMPILE.txt
@@ -51,7 +51,8 @@ Requirements:
 
 Compile:
 - Enter root directory of RawTherapee source tree
-- Type: cmake -D CMAKE_C_COMPILER=gcc-mp-4.5 -D CMAKE_CXX_COMPILER=g++-mp-4.5 .
+- Type: cmake -D CMAKE_C_COMPILER=gcc-mp-4.5 -D CMAKE_CXX_COMPILER=g++-mp-4.5 . (to enable OpenMP) OR:
+        cmake -D OPTION_OMP=false (to disable OpenMP and use the older compiler)
 - Type: make install
 - Type: ./tools/osx/make-app-bundle
 - You will find a RawTherapee.dmg file in release/ folder; this is the distribution release and can be run on any 10.5 or 10.6 Intel machine.