diff --git a/wmmon/Makefile.am b/wmmon/Makefile.am
index 52a3f9a..9e01dcb 100644
--- a/wmmon/Makefile.am
+++ b/wmmon/Makefile.am
@@ -5,3 +5,6 @@ EXTRA_DIST = BUGS CHANGES HINTS
 
 AM_CFLAGS = $(x11_CFLAGS) $(dockapp_CFLAGS)
 LIBS += $(x11_LIBS) $(dockapp_LIBS)
+
+desktopdir = $(datadir)/applications
+dist_desktop_DATA = wmmon.desktop
diff --git a/wmmon/wmmon.desktop b/wmmon/wmmon.desktop
new file mode 100644
index 0000000..6186600
--- /dev/null
+++ b/wmmon/wmmon.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Type=Application
+Name=wmmon
+Comment=Window Maker dockapp for monitoring system information
+Exec=wmmon
+Categories=System;Monitor;
+Keywords=cpu;system load;monitor;dockapp;window maker;