diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3178dee7c..bd22f7aa8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -308,6 +308,7 @@ endif()
 if(APPLE)
 	set(DIRECTFB_FEATURE_TYPE "DISABLED")
 	set(FFMPEG_FEATURE_TYPE "OPTIONAL")
+	set(GSTREAMER_FEATURE_TYPE "OPTIONAL")
 	if(IOS)
 		set(X11_FEATURE_TYPE "DISABLED")
 		set(ALSA_FEATURE_TYPE "DISABLED")
diff --git a/cmake/FindGstreamer.cmake b/cmake/FindGstreamer.cmake
index 0d7065e1b..c4451c61a 100644
--- a/cmake/FindGstreamer.cmake
+++ b/cmake/FindGstreamer.cmake
@@ -1,16 +1,12 @@
-
 include(FindPkgConfig)
 
 pkg_check_modules(PC_GSTREAMER_0_10 gstreamer-0.10)
 pkg_check_modules(PC_GSTREAMER_PLUGINS_BASE_0_10 gstreamer-plugins-base-0.10)
 
 if(PC_GSTREAMER_0_10_FOUND AND PC_GSTREAMER_PLUGINS_BASE_0_10_FOUND)
-	set(GSTREAMER_FOUND TRUE)
-endif()
-
-if(GSTREAMER_FOUND)
 	set(GSTREAMER_INCLUDE_DIRS ${PC_GSTREAMER_0_10_INCLUDE_DIRS} ${PC_GSTREAMER_PLUGINS_BASE_0_10_INCLUDE_DIRS})
 	set(GSTREAMER_LIBRARIES ${PC_GSTREAMER_0_10_LIBRARIES} ${PC_GSTREAMER_PLUGINS_BASE_0_10_LIBRARIES})
 endif()
 
-mark_as_advanced(GSTREAMER_FOUND GSTREAMER_INCLUDE_DIRS GSTREAMER_LIBRARIES)
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GSTREAMER DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIRS)