diff --git a/data/Makefile.am b/data/Makefile.am
index 7e096829..fe43a2ab 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,2 +1,6 @@
 SUBDIRS = icons themes keyboards
-EXTRA_DIST = eekboard.desktop
+
+desktopdir = $(datadir)/applications
+desktop_in_files = eekboard.desktop.in
+dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+@INTLTOOL_DESKTOP_RULE@
diff --git a/data/eekboard.desktop b/data/eekboard.desktop
deleted file mode 100644
index 3424fda4..00000000
--- a/data/eekboard.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Eekboard
-GenericName=Eekboard Virtual Keyboard
-Comment=Virtual Keyboard
-Exec=eekboard-desktop-client
-Icon=eekboard
-Terminal=false
-Type=Application
-Categories=GTK;Utility;