diff --git a/src/po/README.txt b/src/po/README.txt
index a403a2f23b..8efed9651d 100644
--- a/src/po/README.txt
+++ b/src/po/README.txt
@@ -84,7 +84,13 @@ language.
     You should include your name and E-mail address instead, for example:
 	msgstr "Berichten übersetzt bei: John Doe <john@doe.org>"
 
-(3) Clean up
+(3) Remove unused messages (optional)
+    Remove messages that have been marked as obsolete. 
+    Such messages start with "#~".
+
+    The cleanup script will also do that (see next step).
+
+(4) Clean up
     This is very important to make sure the translation works on all systems.
     Comment-out all non-translated strings.  There are two types:
     - items marked with "#, fuzzy"
diff --git a/src/po/check.vim b/src/po/check.vim
index 3bcbef395e..41df8f88a1 100644
--- a/src/po/check.vim
+++ b/src/po/check.vim
@@ -143,6 +143,16 @@ while 1
   endif
 endwhile
 
+" Check that the file is well formed according to msgfmts understanding
+if executable("msgfmt")
+  let filename = expand("%")
+  let a = system("msgfmt --statistics OLD_PO_FILE_INPUT=yes" . filename)
+  if v:shell_error != 0
+    let error = matchstr(a, filename.':\zs\d\+\ze:')+0
+    for line in split(a, '\n') | echomsg line | endfor
+  endif
+endif
+
 if error == 0
   " If all was OK restore the view.
   call winrestview(wsv)
diff --git a/src/version.c b/src/version.c
index cd8a4cfa1e..02d43b6c86 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    830,
 /**/
     829,
 /**/