diff --git a/configure.ac b/configure.ac
index 867c7016..30520e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -150,6 +150,7 @@ Makefile
 src/Makefile
 src/tests/Makefile
 mug/Makefile
+mug/mug.desktop
 man/Makefile
 contrib/Makefile
 ])
diff --git a/mug/Makefile.am b/mug/Makefile.am
index 79d7a9d6..cae59581 100644
--- a/mug/Makefile.am
+++ b/mug/Makefile.am
@@ -49,3 +49,18 @@ mug_LDADD=				\
 	${top_srcdir}/src/libmu.la	\
 	${GTK_LIBS}
 
+icondir=				\
+	$(datarootdir)/icons
+
+icon_DATA=				\
+	mug.png
+
+desktopdir=				\
+	$(datarootdir)/applications
+
+desktop_DATA=				\
+	mug.desktop
+
+EXTRA_DIST=				\
+	$(desktopentry_DATA)
+
diff --git a/mug/mug.desktop.in b/mug/mug.desktop.in
new file mode 100644
index 00000000..8a60306c
--- /dev/null
+++ b/mug/mug.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Version=@PACKAGE_VERSION@
+Type=Application
+Name=Mug
+GenericName=Mail Searcher
+Comment=A UI for the mu mail searcher
+Exec=@prefix@/bin/mug
+X-Text-Domain=mu
+Terminal=false
+Icon=mug
+StartupWMClass=mug
+MimeType=application/x-executable;
diff --git a/mug/mug.png b/mug/mug.png
new file mode 100644
index 00000000..65963ac5
Binary files /dev/null and b/mug/mug.png differ