diff --git a/src/po/check.vim b/src/po/check.vim
index 9cfa36a..24c4d79 100644
--- a/src/po/check.vim
+++ b/src/po/check.vim
@@ -157,6 +157,23 @@
   endif
 endif
 
+" Check that the plural form is properly initialized
+1
+let plural = search('^msgid_plural ', 'n')
+if (plural && search('^"Plural-Forms: ', 'n') == 0) || (plural && search('^msgstr\[0\] ".\+"', 'n') != plural + 1)
+  if search('^"Plural-Forms: ', 'n') == 0
+    echomsg "Missing Plural header"
+    if error == 0
+      let error = search('\(^"[A-Za-z-_]\+: .*\\n"\n\)\+\zs', 'n') - 1
+    endif
+  elseif error == 0
+    let error = plural
+  endif
+elseif !plural && search('^"Plural-Forms: ', 'n')
+  " We allow for a stray plural header, msginit adds one.
+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 04d7814..a9348ef 100644
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1839,
+/**/
     1838,
 /**/
     1837,