diff --git a/src/Makefile b/src/Makefile
index 656c5ee..19b59c2 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -2556,9 +2556,14 @@
 	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim16x16.png $(ICON16PATH)/gvim.png; \
 	fi
 	if test -d $(DESKTOPPATH) -a -w $(DESKTOPPATH); then \
-	   $(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
-		$(SCRIPTSOURCE)/gvim.desktop \
-		$(DESKTOPPATH); \
+	   if test -f po/vim.desktop -a -f po/gvim.desktop; then \
+		$(INSTALL_DATA) po/vim.desktop po/gvim.desktop \
+			$(DESKTOPPATH); \
+	   else \
+		$(INSTALL_DATA) $(SCRIPTSOURCE)/vim.desktop \
+			$(SCRIPTSOURCE)/gvim.desktop \
+			$(DESKTOPPATH); \
+	   fi; \
 	   if test -z "$(DESTDIR)" -a -x "$(UPDATE_DESKTOP_DATABASE)"; then \
 	      $(UPDATE_DESKTOP_DATABASE) -q $(DESKTOPPATH); \
 	   fi \
diff --git a/src/po/Makefile b/src/po/Makefile
index 693b55e..7c03fe4 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -168,7 +168,6 @@
 %.desktop: %.desktop.in $(POFILES)
 	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
 	$(MSGFMT) --desktop -d . --template $< -o $@
-	cp -f $@ ../../runtime/$@
 
 update-po: $(LANGUAGES)
 
diff --git a/src/version.c b/src/version.c
index 29a1f03..5c6e506 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1240,
+/**/
     1239,
 /**/
     1238,