diff --git a/Makefile.local b/Makefile.local
index d579242c..04bac838 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -43,6 +43,10 @@ install-emacs: install emacs
 	install -m0644 notmuch.el $(DESTDIR)$(emacs_lispdir)
 	install -m0644 notmuch.elc $(DESTDIR)$(emacs_lispdir)
 
+install-desktop:
+	install -d $(DESTDIR)$(desktop_dir)
+	desktop-file-install --mode 0644 --dir $(DESTDIR)$(desktop_dir) notmuch.desktop
+
 install-bash:
 	install -d $(DESTDIR)$(bash_completion_dir)
 	install -m0644 contrib/notmuch-completion.bash \
diff --git a/configure b/configure
index d240b6ac..a2af672d 100755
--- a/configure
+++ b/configure
@@ -274,6 +274,9 @@ prefix = ${PREFIX}
 # The directory to which emacs lisp files should be installed
 emacs_lispdir=${emacs_lispdir}
 
+# The directory to which desktop files should be installed
+desktop_dir = \${prefix}/share/applications
+
 # Whether the getline function is available (if not, then notmuch will
 # build its own version)
 HAVE_GETLINE = ${have_getline}