diff --git a/ChangeLog b/ChangeLog
index 0c42ac22c..48d81fcdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 Sun Apr 26 01:05:51 1998  Tom Tromey  <tromey@cygnus.com>
 
+	* acconfig.h (WINDOW_MANAGER): New macro.
+	* configure.in: Added --with-window-manager option.
+
 	* configure.in: Unconditionally look for crypt.h.
 
 Sun Apr 26 10:55:18 EDT 1998 Gregory McLean <gregm@comstar.net>
diff --git a/acconfig.h b/acconfig.h
index 03b59d79b..ccab007b0 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -8,3 +8,6 @@
 #undef VERSION
 #undef HAVE_PROGRAM_INVOCATION_SHORT_NAME
 #undef HAVE_PROGRAM_INVOCATION_NAME
+
+/* Name of default window manager, as string.  */
+#undef WINDOW_MANAGER
diff --git a/configure.in b/configure.in
index 5246338a8..0fe0a8f43 100644
--- a/configure.in
+++ b/configure.in
@@ -58,6 +58,11 @@ AC_SUBST(XF86MISC_LIBS)
 dnl gnome-session
 dnl $GNOME_HAVE_SM comes from GNOME_X_CHECKS
 AM_CONDITIONAL(SESSION, test "$GNOME_HAVE_SM" = true)
+AC_ARG_WITH(window-manager,
+[  --with-window-manager=NAME
+			   Specify default window manager],[
+AC_DEFINE_UNQUOTED(WINDOW_MANAGER, "$with_window_manager")])
+
 
 dnl panel/cdplayer
 PROGRAMS_PANEL_CDPLAYER=""