diff --git a/CMakeLists.txt b/CMakeLists.txt
index fd62429c..0bda6bd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ project(taglib)
 OPTION(BUILD_TESTS "Build the test suite"  OFF)
 OPTION(BUILD_EXAMPLES "Build the examples"  OFF)
 
+OPTION(NO_ITUNES_HACKS "Disable workarounds for iTunes bugs"  OFF)
+
 #add some KDE specific stuff
 set(LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
 set(EXEC_INSTALL_PREFIX  ${CMAKE_INSTALL_PREFIX}       CACHE PATH  "Base directory for executables and libraries" FORCE)
diff --git a/config-taglib.h.cmake b/config-taglib.h.cmake
index cb35884f..56674d6b 100644
--- a/config-taglib.h.cmake
+++ b/config-taglib.h.cmake
@@ -5,3 +5,5 @@
    to minimize recompilations and increase modularity. */
 /* Define if you have libz */
 #cmakedefine   HAVE_ZLIB 1
+
+#cmakedefine   NO_ITUNES_HACKS 1