diff --git a/WindowMaker/Makefile.am b/WindowMaker/Makefile.am
index 58918dde..852724e8 100644
--- a/WindowMaker/Makefile.am
+++ b/WindowMaker/Makefile.am
@@ -74,6 +74,9 @@ dist_prefsdata_DATA =\
 
 nodist_prefsdata_DATA = $(GENERATED_MENUS)
 
+xsessionsdir = @datadir@/xsessions
+xsessions_DATA = wmaker.desktop
+
 EXTRA_DIST = $(addsuffix .in, $(GENERATED_MENUS))
 
 CLEANFILES = $(GENERATED_MENUS)
diff --git a/WindowMaker/wmaker.desktop b/WindowMaker/wmaker.desktop
new file mode 100644
index 00000000..7b57d811
--- /dev/null
+++ b/WindowMaker/wmaker.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Window Maker
+Comment=This session logs you into Window Maker
+Exec=wmaker
+TryExec=wmaker
+DesktopNames=WindowMaker
+X-GDM-SessionRegisters=true