diff --git a/src/po/Makefile b/src/po/Makefile
index 7c03fe4..cc56b83 100644
--- a/src/po/Makefile
+++ b/src/po/Makefile
@@ -165,9 +165,13 @@
 		po/gvim.desktop.in po/vim.desktop.in
 	mv -f ../$(PACKAGE).po $(PACKAGE).pot
 
-%.desktop: %.desktop.in $(POFILES)
+vim.desktop: vim.desktop.in $(POFILES)
 	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
-	$(MSGFMT) --desktop -d . --template $< -o $@
+	$(MSGFMT) --desktop -d . --template vim.desktop.in -o vim.desktop
+
+gvim.desktop: gvim.desktop.in $(POFILES)
+	@echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS
+	$(MSGFMT) --desktop -d . --template gvim.desktop.in -o gvim.desktop
 
 update-po: $(LANGUAGES)
 
diff --git a/src/version.c b/src/version.c
index 0882fa2..f03346c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1255,
+/**/
     1254,
 /**/
     1253,