diff --git a/cnslock/Makefile.am b/cnslock/Makefile.am
index 1103536..7139189 100644
--- a/cnslock/Makefile.am
+++ b/cnslock/Makefile.am
@@ -5,3 +5,6 @@ EXTRA_DIST = CHANGES
 
 AM_CFLAGS = $(x11_CFLAGS) $(dockapp_CFLAGS)
 LIBS += $(x11_LIBS) $(dockapp_LIBS)
+
+desktopdir = @datadir@/applications
+dist_desktop_DATA = cnslock.desktop
diff --git a/cnslock/cnslock.desktop b/cnslock/cnslock.desktop
new file mode 100644
index 0000000..640c890
--- /dev/null
+++ b/cnslock/cnslock.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Type=Application
+Name=cnslock
+Comment=Displays the current state of the caps/num/scroll lock keys
+Exec=cnslock
+Categories=System;Monitor
+Keywords=keyboard;caps lock;num lock;scroll lock;dockapp;window maker