diff --git a/CMakeLists.txt b/CMakeLists.txt
index 611bc5597..ec116e35b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -555,8 +555,8 @@ if(NOT X11_Xext_FOUND)
     message(WARNING "The X11 Xext extension was not found")
     katie_definition(-DQT_NO_XSYNC -DQT_NO_XSHAPE -DQT_NO_XSHM)
 endif()
-if(NOT X11_SM_FOUND)
-    message(WARNING "X11 SM was not found thus disabling session manager support")
+if(NOT X11_SM_FOUND OR NOT X11_ICE_FOUND)
+    message(WARNING "X11 SM/ICE was not found thus disabling session manager support")
     katie_definition(-DQT_NO_SESSIONMANAGER)
 endif()
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 9d97ca946..16358c301 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -2,7 +2,6 @@
 set(EXTRA_GUI_LIBS
     KtCore KtXml
     ${FREETYPE_LIBRARIES}
-    ${X11_LIBRARIES}
     ${X11_X11_LIB}
 )
 
@@ -935,7 +934,7 @@ set(GUI_SOURCES
 )
 
 # keep in sync with the top-level CMake file, only libraries setup is needed here
-foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xext)
+foreach(x11ext Xshape Xinerama Xrandr Xrender Xfixes Xcursor Xext SM ICE)
     if(X11_${x11ext}_FOUND AND X11_${x11ext}_LIB)
         set(EXTRA_GUI_LIBS
             ${EXTRA_GUI_LIBS}