diff --git a/tools/Makefile.in b/tools/Makefile.in
index fba5fef3c3f..1c42ad6e210 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -28,6 +28,8 @@ INSTALLSUBDIRS = $(SUBDIRS)
 
 EXTRASUBDIRS = winapi_check
 
+UPDATE_DESKTOP_DATABASE = update-desktop-database
+
 all: $(PROGRAMS) $(SUBDIRS)
 
 @MAKE_RULES@
@@ -46,13 +48,17 @@ wineprefixcreate: wineprefixcreate.in
 	chmod +x wineprefixcreate
 
 install:: wineprefixcreate
-	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(datadir)/wine
+	$(MKINSTALLDIRS) $(bindir) $(mandir)/man$(prog_manext) $(datadir)/wine $(datadir)/applications
 	$(INSTALL_SCRIPT) $(SRCDIR)/winemaker $(bindir)/winemaker
 	$(INSTALL_SCRIPT) wineprefixcreate $(bindir)/wineprefixcreate
 	$(INSTALL_DATA) $(SRCDIR)/winemaker.man $(mandir)/man$(prog_manext)/winemaker.$(prog_manext)
 	$(INSTALL_DATA) $(SRCDIR)/wine.inf $(datadir)/wine/wine.inf
+	$(INSTALL_DATA) $(SRCDIR)/wine.desktop $(datadir)/applications/wine.desktop
+	-$(UPDATE_DESKTOP_DATABASE)
 
 uninstall::
-	$(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) $(datadir)/wine/wine.inf
+	$(RM) $(bindir)/winemaker $(bindir)/wineprefixcreate $(mandir)/man$(prog_manext)/winemaker.$(prog_manext) \
+	      $(datadir)/wine/wine.inf $(datadir)/applications/wine.desktop
+	-$(UPDATE_DESKTOP_DATABASE)
 
 ### Dependencies:
diff --git a/tools/wine.desktop b/tools/wine.desktop
new file mode 100644
index 00000000000..c0f3ad93d21
--- /dev/null
+++ b/tools/wine.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Encoding=UTF-8
+Name=Wine Windows Emulator
+Name[de]=Wine Windows-Emulator
+Exec=wine %f
+MimeType=application/x-ms-dos-executable
+NoDisplay=true