diff --git a/wmshutdown/Makefile.am b/wmshutdown/Makefile.am
index e6983cf..6cce92e 100644
--- a/wmshutdown/Makefile.am
+++ b/wmshutdown/Makefile.am
@@ -9,3 +9,6 @@ dist_man_MANS = wmshutdown.1
 
 icondir = @datadir@/icons/hicolor/48x48/apps
 dist_icon_DATA = wmshutdown.png
+
+desktopdir = @datadir@/applications
+dist_desktop_DATA = wmshutdown.desktop
diff --git a/wmshutdown/wmshutdown.desktop b/wmshutdown/wmshutdown.desktop
new file mode 100644
index 0000000..7534764
--- /dev/null
+++ b/wmshutdown/wmshutdown.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=wmshutdown
+Comment=Window Maker dockapp to shut down or reboot your machine
+Exec=wmshutdown
+Categories=System
+Keywords=power;dockapp;window maker
+Icon=wmshutdown