diff --git a/CMakeLists.txt b/CMakeLists.txt
index da928674..752d6064 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(taglib)
 
 find_package(ZLIB)
 
-OPTION(BUILD_TESTS "Create test" OFF)
+OPTION(BUILD_TESTS "Create tests and examples"  OFF)
 
 #add some KDE specific stuff
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
@@ -23,7 +23,9 @@ configure_file(config-taglib.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h )
 ADD_SUBDIRECTORY( taglib ) 
 
 ADD_SUBDIRECTORY(tests)
+ADD_SUBDIRECTORY(examples)
 
+ADD_SUBDIRECTORY(bindings)
 
 INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/taglib.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
 INSTALL( PROGRAMS  ${CMAKE_CURRENT_BINARY_DIR}/taglib-config DESTINATION ${BIN_INSTALL_DIR})
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 0efdf825..78dcda50 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/taglib ${CMAKE_SOURCE_DIR}/taglib/toolkit ${CMAKE_SOURCE_DIR}/taglib/mpeg ${CMAKE_SOURCE_DIR}/taglib/mpeg/id3v1 ${CMAKE_SOURCE_DIR}/taglib/mpeg/id3v2 ${CMAKE_SOURCE_DIR}/taglib/bindings/c  )
-
+if(BUILD_TESTS)
+INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/taglib ${CMAKE_SOURCE_DIR}/taglib/toolkit ${CMAKE_SOURCE_DIR}/taglib/mpeg ${CMAKE_SOURCE_DIR}/taglib/mpeg/id3v1 ${CMAKE_SOURCE_DIR}/taglib/mpeg/id3v2 ${CMAKE_SOURCE_DIR}/bindings/c/  )
 
 ########### next target ###############
 
@@ -52,7 +52,7 @@ framelist.cpp
 
 ADD_EXECUTABLE(framelist ${framelist_SRCS})
 
-TARGET_LINK_LIBRARIES(framelist  ${QT_AND_KDECORE_LIBS} )
+TARGET_LINK_LIBRARIES(framelist  tag )
 
 INSTALL(PROGRAMS framelist DESTINATION ${BIN_INSTALL_DIR})
 
@@ -60,15 +60,13 @@ INSTALL(PROGRAMS framelist DESTINATION ${BIN_INSTALL_DIR})
 ########### next target ###############
 
 SET(strip-id3v1_SRCS
-dummy.cpp
-)
+	strip-id3v1.cpp)
 
-KDE3_AUTOMOC(${strip-id3v1_SRCS})
-
-FILE(WRITE dummy.cpp "//autogenerated file by cmake\n")
 ADD_EXECUTABLE(strip-id3v1 ${strip-id3v1_SRCS})
 
 TARGET_LINK_LIBRARIES(strip-id3v1  tag )
 
 INSTALL(PROGRAMS strip-id3v1 DESTINATION ${BIN_INSTALL_DIR})
 
+endif(BUILD_TESTS)
+