diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ecc689e..00801106 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -15,27 +15,27 @@ include_directories(
     ${KDE4_INCLUDES}
 )
 
-macro_optional_add_subdirectory(about-distro)
-macro_optional_add_subdirectory(ark)
-macro_optional_add_subdirectory(filelight)
-macro_optional_add_subdirectory(gwenview)
-macro_optional_add_subdirectory(jovie)
-macro_optional_add_subdirectory(kcalc)
-macro_optional_add_subdirectory(kcolorchooser)
-macro_optional_add_subdirectory(kcron)
-macro_optional_add_subdirectory(kdeplasma-addons)
-macro_optional_add_subdirectory(kemu)
-macro_optional_add_subdirectory(kget)
-macro_optional_add_subdirectory(kmix)
-macro_optional_add_subdirectory(krdc)
-macro_optional_add_subdirectory(krfb)
-macro_optional_add_subdirectory(ksnapshot)
-macro_optional_add_subdirectory(ksystemlog)
-macro_optional_add_subdirectory(ktimer)
-macro_optional_add_subdirectory(kuser)
-macro_optional_add_subdirectory(kvkbd)
-macro_optional_add_subdirectory(okular)
-macro_optional_add_subdirectory(partitionmanager)
-macro_optional_add_subdirectory(thumbnailers)
+kde4_optional_add_subdirectory(about-distro)
+kde4_optional_add_subdirectory(ark)
+kde4_optional_add_subdirectory(filelight)
+kde4_optional_add_subdirectory(gwenview)
+kde4_optional_add_subdirectory(jovie)
+kde4_optional_add_subdirectory(kcalc)
+kde4_optional_add_subdirectory(kcolorchooser)
+kde4_optional_add_subdirectory(kcron)
+kde4_optional_add_subdirectory(kdeplasma-addons)
+kde4_optional_add_subdirectory(kemu)
+kde4_optional_add_subdirectory(kget)
+kde4_optional_add_subdirectory(kmix)
+kde4_optional_add_subdirectory(krdc)
+kde4_optional_add_subdirectory(krfb)
+kde4_optional_add_subdirectory(ksnapshot)
+kde4_optional_add_subdirectory(ksystemlog)
+kde4_optional_add_subdirectory(ktimer)
+kde4_optional_add_subdirectory(kuser)
+kde4_optional_add_subdirectory(kvkbd)
+kde4_optional_add_subdirectory(okular)
+kde4_optional_add_subdirectory(partitionmanager)
+kde4_optional_add_subdirectory(thumbnailers)
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/ark/CMakeLists.txt b/ark/CMakeLists.txt
index 170e931d..a1467535 100644
--- a/ark/CMakeLists.txt
+++ b/ark/CMakeLists.txt
@@ -8,8 +8,6 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR})
     add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
 endif()
 
-include(MacroLibrary)
-
 macro_optional_find_package(LibArchive 3.0.3)
 set_package_properties(LibArchive PROPERTIES
     DESCRIPTION "A library for dealing with a wide variety of archive file formats"
diff --git a/partitionmanager/INSTALL b/partitionmanager/INSTALL
index 6f7afc91..f24f49ec 100644
--- a/partitionmanager/INSTALL
+++ b/partitionmanager/INSTALL
@@ -49,17 +49,3 @@ in the build directory and modify CMAKE_INSTALL_PREFIX there.
 KDE Partition Manager should be run as root. Running it as an unprivileged user
 does no harm, but the default settings will not allow you to apply any
 operations (i.e., you can click through the UI, but cannot modify your disks).
-
-
-5. Troubleshooting
-
-If you are getting an error like this during the build:
-
-index.docbook:71: parser error : Entity 'partman' not defined
-
-there is a problem with a documentation file. This is easily fixed by
-commenting out the offending language in doc/CMakeLists.txt -- the error
-message should indicate which language causes the error. As an alternative, you
-can disable building all documentation by commenting out the
-macro_optional_add_subdirectory(doc) line in the toplevel CMakeLists.txt file.
-