32 files changed, 40 insertions, 18 deletions
diff --git a/runtime/doc/Makefile b/runtime/doc/Makefile
index e998804d37..82771c08f2 100644
--- a/runtime/doc/Makefile
+++ b/runtime/doc/Makefile
@@ -264,10 +264,43 @@ HTMLS = \
 	windows.html \
 	workshop.html
 
+MANPAGES = \
+	manpages/vim.man \
+	manpages/evim.man \
+	manpages/vimdiff.man \
+	manpages/vimtutor.man \
+	manpages/xxd.man \
+	manpages/de/vim-de.man \
+	manpages/fr/vim-fr.man \
+	manpages/fr/evim-fr.man \
+	manpages/fr/vimdiff-fr.man \
+	manpages/fr/vimtutor-fr.man \
+	manpages/fr/xxd-fr.man \
+	manpages/pl/vim-pl.man \
+	manpages/pl/evim-pl.man \
+	manpages/pl/vimdiff-pl.man \
+	manpages/pl/vimtutor-pl.man \
+	manpages/pl/xxd-pl.man \
+	manpages/it/vim-it.man \
+	manpages/it/evim-it.man \
+	manpages/it/vimdiff-it.man \
+	manpages/it/vimtutor-it.man \
+	manpages/it/xxd-it.man \
+	manpages/ru/vim-ru.man \
+	manpages/ru/evim-ru.man \
+	manpages/ru/vimdiff-ru.man \
+	manpages/ru/vimtutor-ru.man \
+	manpages/ru/xxd-ru.man \
+	manpages/ja/vim-ja.man \
+	manpages/ja/evim-ja.man \
+	manpages/ja/vimdiff-ja.man \
+	manpages/ja/vimtutor-ja.man \
+	manpages/ja/xxd-ja.man
+
 .SUFFIXES:
-.SUFFIXES: .c .o .txt .html
+.SUFFIXES: .c .o .txt .html .1 .man
 
-all: tags vim.man evim.man vimdiff.man vimtutor.man xxd.man
+all: tags manpages
 
 # Use Vim to generate the tags file.  Can only be used when Vim has been
 # compiled and installed.  Supports multiple languages.
@@ -282,22 +315,11 @@ tags: doctags $(DOCS)
 doctags: doctags.c
 	$(CC) doctags.c -o doctags
 
-vim.man: vim.1
-	nroff -man vim.1 | sed -e s/.//g > vim.man
-
-evim.man: evim.1
-	nroff -man evim.1 | sed -e s/.//g > evim.man
-
-vimdiff.man: vimdiff.1
-	nroff -man vimdiff.1 | sed -e s/.//g > vimdiff.man
-
-vimtutor.man: vimtutor.1
-	nroff -man vimtutor.1 | sed -e s/.//g > vimtutor.man
-
-xxd.man: xxd.1
-	nroff -man xxd.1 | sed -e s/.//g > xxd.man
+manpages: $(MANPAGES)
 
-# TODO(stefan991): add targets for translated manpages
+# OSX groff dosn't support utf-8 as input encoding, so this won't work there.
+.1.man:
+	groff -k -mandoc -Tutf8 $< | sed -e s/.^H//g > $@
 
 # Awk version of .txt to .html conversion.
 html: noerrors tags $(HTMLS)
@@ -329,5 +351,5 @@ perlhtml: tags $(DOCS)
 	./vim2html.pl tags $(DOCS)
 
 clean:
-	-rm doctags *.html tags.ref
+	-rm -f doctags *.html tags.ref $(MANPAGES)
 
diff --git a/runtime/doc/vim-de.1 b/runtime/doc/manpages/de/vim-de.1
index f79e622a74..f79e622a74 100644
--- a/runtime/doc/vim-de.1
+++ b/runtime/doc/manpages/de/vim-de.1
diff --git a/runtime/doc/evim.1 b/runtime/doc/manpages/evim.1
index bb859ceada..bb859ceada 100644
--- a/runtime/doc/evim.1
+++ b/runtime/doc/manpages/evim.1
diff --git a/runtime/doc/evim-fr.1 b/runtime/doc/manpages/fr/evim-fr.1
index 2b38e66cb5..2b38e66cb5 100644
--- a/runtime/doc/evim-fr.1
+++ b/runtime/doc/manpages/fr/evim-fr.1
diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/manpages/fr/vim-fr.1
index 67be106673..67be106673 100644
--- a/runtime/doc/vim-fr.1
+++ b/runtime/doc/manpages/fr/vim-fr.1
diff --git a/runtime/doc/vimdiff-fr.1 b/runtime/doc/manpages/fr/vimdiff-fr.1
index 3b44a3dd58..3b44a3dd58 100644
--- a/runtime/doc/vimdiff-fr.1
+++ b/runtime/doc/manpages/fr/vimdiff-fr.1
diff --git a/runtime/doc/vimtutor-fr.1 b/runtime/doc/manpages/fr/vimtutor-fr.1
index f47f840ec1..f47f840ec1 100644
--- a/runtime/doc/vimtutor-fr.1
+++ b/runtime/doc/manpages/fr/vimtutor-fr.1
diff --git a/runtime/doc/xxd-fr.1 b/runtime/doc/manpages/fr/xxd-fr.1
index 7956b3ba2a..7956b3ba2a 100644
--- a/runtime/doc/xxd-fr.1
+++ b/runtime/doc/manpages/fr/xxd-fr.1
diff --git a/runtime/doc/evim-it.1 b/runtime/doc/manpages/it/evim-it.1
index f96d0cb42c..f96d0cb42c 100644
--- a/runtime/doc/evim-it.1
+++ b/runtime/doc/manpages/it/evim-it.1
diff --git a/runtime/doc/vim-it.1 b/runtime/doc/manpages/it/vim-it.1
index 51e7e043da..51e7e043da 100644
--- a/runtime/doc/vim-it.1
+++ b/runtime/doc/manpages/it/vim-it.1
diff --git a/runtime/doc/vimdiff-it.1 b/runtime/doc/manpages/it/vimdiff-it.1
index 090892fa93..090892fa93 100644
--- a/runtime/doc/vimdiff-it.1
+++ b/runtime/doc/manpages/it/vimdiff-it.1
diff --git a/runtime/doc/vimtutor-it.1 b/runtime/doc/manpages/it/vimtutor-it.1
index a33dcb00b0..a33dcb00b0 100644
--- a/runtime/doc/vimtutor-it.1
+++ b/runtime/doc/manpages/it/vimtutor-it.1
diff --git a/runtime/doc/xxd-it.1 b/runtime/doc/manpages/it/xxd-it.1
index b6ccabd2e3..b6ccabd2e3 100644
--- a/runtime/doc/xxd-it.1
+++ b/runtime/doc/manpages/it/xxd-it.1
diff --git a/runtime/doc/evim-ja.1 b/runtime/doc/manpages/ja/evim-ja.1
index 1b7a657ebc..1b7a657ebc 100644
--- a/runtime/doc/evim-ja.1
+++ b/runtime/doc/manpages/ja/evim-ja.1
diff --git a/runtime/doc/vim-ja.1 b/runtime/doc/manpages/ja/vim-ja.1
index a4788b3c48..a4788b3c48 100644
--- a/runtime/doc/vim-ja.1
+++ b/runtime/doc/manpages/ja/vim-ja.1
diff --git a/runtime/doc/vimdiff-ja.1 b/runtime/doc/manpages/ja/vimdiff-ja.1
index 56fadfef6e..56fadfef6e 100644
--- a/runtime/doc/vimdiff-ja.1
+++ b/runtime/doc/manpages/ja/vimdiff-ja.1
diff --git a/runtime/doc/vimtutor-ja.1 b/runtime/doc/manpages/ja/vimtutor-ja.1
index 29b9b48f2c..29b9b48f2c 100644
--- a/runtime/doc/vimtutor-ja.1
+++ b/runtime/doc/manpages/ja/vimtutor-ja.1
diff --git a/runtime/doc/xxd-ja.1 b/runtime/doc/manpages/ja/xxd-ja.1
index 8a8d54b021..8a8d54b021 100644
--- a/runtime/doc/xxd-ja.1
+++ b/runtime/doc/manpages/ja/xxd-ja.1
diff --git a/runtime/doc/evim-pl.1 b/runtime/doc/manpages/pl/evim-pl.1
index 096a12add2..096a12add2 100644
--- a/runtime/doc/evim-pl.1
+++ b/runtime/doc/manpages/pl/evim-pl.1
diff --git a/runtime/doc/vim-pl.1 b/runtime/doc/manpages/pl/vim-pl.1
index f3551d2f63..f3551d2f63 100644
--- a/runtime/doc/vim-pl.1
+++ b/runtime/doc/manpages/pl/vim-pl.1
diff --git a/runtime/doc/vimdiff-pl.1 b/runtime/doc/manpages/pl/vimdiff-pl.1
index d66fdc9c03..d66fdc9c03 100644
--- a/runtime/doc/vimdiff-pl.1
+++ b/runtime/doc/manpages/pl/vimdiff-pl.1
diff --git a/runtime/doc/vimtutor-pl.1 b/runtime/doc/manpages/pl/vimtutor-pl.1
index 199fcd0e8f..199fcd0e8f 100644
--- a/runtime/doc/vimtutor-pl.1
+++ b/runtime/doc/manpages/pl/vimtutor-pl.1
diff --git a/runtime/doc/xxd-pl.1 b/runtime/doc/manpages/pl/xxd-pl.1
index e63ce64b74..e63ce64b74 100644
--- a/runtime/doc/xxd-pl.1
+++ b/runtime/doc/manpages/pl/xxd-pl.1
diff --git a/runtime/doc/evim-ru.1 b/runtime/doc/manpages/ru/evim-ru.1
index 581c364c22..581c364c22 100644
--- a/runtime/doc/evim-ru.1
+++ b/runtime/doc/manpages/ru/evim-ru.1
diff --git a/runtime/doc/vim-ru.1 b/runtime/doc/manpages/ru/vim-ru.1
index ef527213e3..ef527213e3 100644
--- a/runtime/doc/vim-ru.1
+++ b/runtime/doc/manpages/ru/vim-ru.1
diff --git a/runtime/doc/vimdiff-ru.1 b/runtime/doc/manpages/ru/vimdiff-ru.1
index 2f17e9c2e5..2f17e9c2e5 100644
--- a/runtime/doc/vimdiff-ru.1
+++ b/runtime/doc/manpages/ru/vimdiff-ru.1
diff --git a/runtime/doc/vimtutor-ru.1 b/runtime/doc/manpages/ru/vimtutor-ru.1
index 6b1ba90df0..6b1ba90df0 100644
--- a/runtime/doc/vimtutor-ru.1
+++ b/runtime/doc/manpages/ru/vimtutor-ru.1
diff --git a/runtime/doc/xxd-ru.1 b/runtime/doc/manpages/ru/xxd-ru.1
index 647845bab4..647845bab4 100644
--- a/runtime/doc/xxd-ru.1
+++ b/runtime/doc/manpages/ru/xxd-ru.1
diff --git a/runtime/doc/vim.1 b/runtime/doc/manpages/vim.1
index 820caa24f5..820caa24f5 100644
--- a/runtime/doc/vim.1
+++ b/runtime/doc/manpages/vim.1
diff --git a/runtime/doc/vimdiff.1 b/runtime/doc/manpages/vimdiff.1
index bed2b32889..bed2b32889 100644
--- a/runtime/doc/vimdiff.1
+++ b/runtime/doc/manpages/vimdiff.1
diff --git a/runtime/doc/vimtutor.1 b/runtime/doc/manpages/vimtutor.1
index 0aa7e8d8d9..0aa7e8d8d9 100644
--- a/runtime/doc/vimtutor.1
+++ b/runtime/doc/manpages/vimtutor.1
diff --git a/runtime/doc/xxd.1 b/runtime/doc/manpages/xxd.1
index e8f7358591..e8f7358591 100644
--- a/runtime/doc/xxd.1
+++ b/runtime/doc/manpages/xxd.1