diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog
index ac3d6c32e..f70ddb0cd 100644
--- a/libwindow-settings/ChangeLog
+++ b/libwindow-settings/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 16:08:17 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-wm-manager.c (gnome_wm_manager_init): Use glib path
+	builders instead of the ones in libgnome.
+
 2008-10-06  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 554962 – maixmize horizontally/vertically doesn't work with
diff --git a/libwindow-settings/Makefile.am b/libwindow-settings/Makefile.am
index cd7a84476..9ca482891 100644
--- a/libwindow-settings/Makefile.am
+++ b/libwindow-settings/Makefile.am
@@ -4,7 +4,8 @@ INCLUDES = 								\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"			\
 	-DG_LOG_DOMAIN=\"capplet-common\"				\
-	-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\" \
+	-DGNOME_WM_PROPERTY_PATH=\"$(datadir)/gnome/wm-properties\"	\
+	-DGNOME_WINDOW_MANAGER_MODULE_PATH=\""$(WM_MODULE_DIR)"\"	\
 	-I$(top_srcdir)/						\
 	@CAPPLET_CFLAGS@						\
 	-DMETACITY_THEME_DIR=\""$(datadir)/themes"\"
diff --git a/libwindow-settings/gnome-wm-manager.c b/libwindow-settings/gnome-wm-manager.c
index 0b2190249..6f17174ee 100644
--- a/libwindow-settings/gnome-wm-manager.c
+++ b/libwindow-settings/gnome-wm-manager.c
@@ -32,7 +32,6 @@
 #include <glib/gi18n.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
-#include <libgnome/gnome-util.h>
 
 #include <sys/types.h>
 #include <dirent.h>
@@ -93,8 +92,7 @@ list_desktop_files_in_dir (gchar *directory)
                         continue;
                 
                 result = g_list_prepend (result, 
-                                         g_concat_dir_and_file (directory,
-                                                                child->d_name));
+                                         g_build_filename (directory, child->d_name, NULL));
         }
         closedir (dir);
         
@@ -225,11 +223,11 @@ gnome_wm_manager_init (void)
 
         done_scan = TRUE;
         
-        tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
+        tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, "gnome", "wm-properties", NULL);
         scan_wm_directory (tempdir, FALSE);
         g_free (tempdir);
-        
-	tempdir = gnome_util_home_file("wm-properties/");
+
+	tempdir = g_build_filename (g_get_home_dir(), ".gnome2", "wm-properties", NULL);
         scan_wm_directory (tempdir, TRUE);
         g_free (tempdir);