diff --git a/ChangeLog b/ChangeLog
index 3e140454a..fab90d4ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-09-04  Havoc Pennington  <hp@pobox.com>
+
+	* src/wm-tester/Makefile.am (noinst_PROGRAMS): make test apps
+	noinst
+
+	* src/metacity.desktop: for the capplet
+
+	* src/Makefile.am: add .desktop file
+
 2001-09-01  Havoc Pennington  <hp@pobox.com>
 
 	* src/errors.c: clean up the code, and replace GDK X error handler
diff --git a/src/Makefile.am b/src/Makefile.am
index eaf16f583..25d930735 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,3 +49,9 @@ metacity_SOURCES= 				\
 bin_PROGRAMS=metacity
 
 metacity_LDADD= @METACITY_LIBS@
+
+desktopfilesdir=$(datadir)/gnome/wm-properties
+desktopfiles_DATA=metacity.desktop
+
+EXTRA_DIST=$(desktopfiles_DATA)
+
diff --git a/src/metacity.desktop b/src/metacity.desktop
new file mode 100644
index 000000000..6daabe89f
--- /dev/null
+++ b/src/metacity.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Metacity
+Exec=metacity
+
+[Window Manager]
+SessionManaged=true
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index 3cc8eeeb4..e6ec26736 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -7,7 +7,7 @@ wm_tester_SOURCES= 				\
 test_gravity_SOURCES=				\
 	test-gravity.c
 
-bin_PROGRAMS=wm-tester test-gravity
+noinst_PROGRAMS=wm-tester test-gravity
 
 wm_tester_LDADD= @METACITY_LIBS@
 test_gravity_LDADD= @METACITY_LIBS@
\ No newline at end of file