diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84454a31..fd62429c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(taglib)
 
-OPTION(BUILD_TESTS "Create tests and examples"  OFF)
+OPTION(BUILD_TESTS "Build the test suite"  OFF)
+OPTION(BUILD_EXAMPLES "Build the examples"  OFF)
 
 #add some KDE specific stuff
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 79ba9708..1c06f7cf 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(BUILD_TESTS)
+if(BUILD_EXAMPLES)
 INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/../taglib
 		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/toolkit
 		     ${CMAKE_CURRENT_SOURCE_DIR}/../taglib/mpeg
@@ -73,5 +73,5 @@ TARGET_LINK_LIBRARIES(strip-id3v1  tag )
 
 #INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/strip-id3v1 DESTINATION ${BIN_INSTALL_DIR})
 
-endif(BUILD_TESTS)
+endif(BUILD_EXAMPLES)