diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba729438ee..647df54f9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,7 @@ OPTION(KWIN_BUILD_OPENGL_1_COMPOSITING "Enable support for OpenGL 1.x, automatic
 OPTION(KWIN_BUILD_ACTIVITIES "Enable building of KWin with kactivities support" ON)
 if(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
    OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." OFF)
-else(${KDE_PLATFORM_PROFILE} STREQUAL "Desktop")
+else()
    OPTION(KWIN_PLASMA_ACTIVE "Enable building KWin for Plasma Active." On)
 endif()
 
@@ -233,7 +233,7 @@ set(kwin_OPENGL_LIBS )
 find_library(XF86VM_LIBRARY Xxf86vm)
 if (XF86VM_LIBRARY)
     set(kwin_XLIB_LIBS ${kwin_XLIB_LIBS} ${XF86VM_LIBRARY})
-else(XF86VM_LIBRARY)
+else()
     add_definitions(-DKWIN_NO_XF86VM)
 endif()
 
diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt
index 5f6c4b1a40..52a481727c 100644
--- a/effects/CMakeLists.txt
+++ b/effects/CMakeLists.txt
@@ -72,7 +72,7 @@ macro( KWIN4_ADD_EFFECT_CONFIG name )
     foreach( file ${ARGN} )
         if( file MATCHES \\.ui )
             set( kwin4_effect_ui ${kwin4_effect_ui} ${file} )
-        else( file MATCHES \\.ui )
+        else()
             set( kwin4_effect_src ${kwin4_effect_src} ${file} )
         endif()
     endforeach()