diff --git a/ROX-Filer.xml b/ROX-Filer.xml
index 6fae16c67..4cfab2acc 100644
--- a/ROX-Filer.xml
+++ b/ROX-Filer.xml
@@ -37,6 +37,9 @@
     <requires interface="http://0install.net/2008/interfaces/libxml2-dev.xml">
       <environment insert="lib/pkgconfig" name="PKG_CONFIG_PATH"/>
     </requires>
+    <requires interface="http://repo.roscidus.com/lib/x-sm-dev">
+      <environment insert="lib/pkgconfig" name="PKG_CONFIG_PATH"/>
+    </requires>
 
     <implementation id="." version="2.11-post"/>
   </group>
diff --git a/ROX-Filer/src/Makefile.in b/ROX-Filer/src/Makefile.in
index dee7ad0e8..057eaaa3f 100644
--- a/ROX-Filer/src/Makefile.in
+++ b/ROX-Filer/src/Makefile.in
@@ -7,14 +7,14 @@ CC = @CC@
 .SUFFIXES: .c .o
 
 PKG_CONFIG = @PKG_CONFIG@
-LIBS = @LIBS@ @LFS_LDFLAGS@ -lICE -lSM
+LIBS = @LIBS@ @LFS_LDFLAGS@
 #PROF = -fprofile-arcs -pg
 
 PKG_CONFIG_FLAGS=
 
 CFLAGS = -I. -I${srcdir} ${PROF} @CFLAGS@ @LFS_CFLAGS@ \
-	 `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --cflags gtk+-2.0 libxml-2.0`
-LDFLAGS = ${PROF} @LDFLAGS@ `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --libs gtk+-2.0 libxml-2.0 | sed 's/-lpangoxft-[^ ]*//'` ${LIBS}
+	 `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --cflags gtk+-2.0 libxml-2.0 sm ice`
+LDFLAGS = ${PROF} @LDFLAGS@ `${PKG_CONFIG} ${PKG_CONFIG_FLAGS} --libs gtk+-2.0 libxml-2.0 sm ice| sed 's/-lpangoxft-[^ ]*//'` ${LIBS}
 
 ############ Things to change for different programs
 
diff --git a/ROX-Filer/src/configure.in b/ROX-Filer/src/configure.in
index 44759f347..9947e7695 100644
--- a/ROX-Filer/src/configure.in
+++ b/ROX-Filer/src/configure.in
@@ -93,6 +93,7 @@ else
 fi
 ])
 
+ROX_REQUIRE(sm, 1)
 ROX_REQUIRE(gtk+-2.0, 2.12.0)
 ROX_REQUIRE(libxml-2.0, 2.0.0)
 ROX_REQUIRE(shared-mime-info, 0.14)
@@ -162,10 +163,6 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h mntent.h sys/ucred.h sys/mntent.h apsymbols.h apbuild/apsymbols.h sys/statvfs.h sys/vfs.h wctype.h libintl.h sys/inotify.h)
 
-AC_CHECK_HEADER([X11/SM/SMlib.h], [],
-  [AC_MSG_ERROR([Session management library (libsm) missing. It is part of the X server distribution. Try installing the libsm-dev package.])]
-)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_UID_T