diff --git a/capplets/windows/ChangeLog b/capplets/windows/ChangeLog
index 4a4061c26..bea384826 100644
--- a/capplets/windows/ChangeLog
+++ b/capplets/windows/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 16:56:50 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-window-properties.c: Use gtk_init() instead of
+	gnome_program_init().
+
 ==================== 2.24.0.1 ====================
 
 2008-09-12  Christian Persch  <chpe@gnome.org>
diff --git a/capplets/windows/gnome-window-properties.c b/capplets/windows/gnome-window-properties.c
index 59379a934..940642799 100644
--- a/capplets/windows/gnome-window-properties.c
+++ b/capplets/windows/gnome-window-properties.c
@@ -27,6 +27,9 @@
 #include <config.h>
 #endif
 
+#include <stdlib.h>
+#include <glib/gi18n.h>
+#include <string.h>
 #include <glade/glade.h>
 #include <gnome-wm-manager.h>
 
@@ -373,7 +376,6 @@ try_spawn_config_tool (GdkScreen *screen)
 int
 main (int argc, char **argv)
 {
-	GnomeProgram *program;
         GdkScreen *screen;
 	GnomeWMSettings new_settings;
 	int rc = 0;
@@ -383,9 +385,7 @@ main (int argc, char **argv)
 	bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
         textdomain (GETTEXT_PACKAGE);
 
-  	program = gnome_program_init ("gnome-window-properties", VERSION,
-				      LIBGNOMEUI_MODULE, argc, argv,
-				      NULL);
+        gtk_init (&argc, &argv);
 
         gnome_wm_manager_init ();
 
@@ -474,7 +474,6 @@ main (int argc, char **argv)
 	g_object_unref (dialog);
 
 out:
-	g_object_unref (program);
         return rc;
 }
 
diff --git a/libwindow-settings/ChangeLog b/libwindow-settings/ChangeLog
index f70ddb0cd..a4a692a9f 100644
--- a/libwindow-settings/ChangeLog
+++ b/libwindow-settings/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 24 16:56:23 2008  Søren Sandmann  <sandmann@redhat.com>
+
+	* gnome-wm-manager.c (gnome_wm_manager_init): Use correct path for
+	window manager properties
+
 Fri Oct 24 16:08:17 2008  Søren Sandmann  <sandmann@redhat.com>
 
 	* gnome-wm-manager.c (gnome_wm_manager_init): Use glib path
diff --git a/libwindow-settings/gnome-wm-manager.c b/libwindow-settings/gnome-wm-manager.c
index 6f17174ee..012fb3ac4 100644
--- a/libwindow-settings/gnome-wm-manager.c
+++ b/libwindow-settings/gnome-wm-manager.c
@@ -223,7 +223,7 @@ gnome_wm_manager_init (void)
 
         done_scan = TRUE;
         
-        tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, "gnome", "wm-properties", NULL);
+        tempdir = g_build_filename (GNOME_WM_PROPERTY_PATH, NULL);
         scan_wm_directory (tempdir, FALSE);
         g_free (tempdir);