diff --git a/installer/resources/locale-man/man.pot b/installer/resources/locale-man/man.pot
index 90dcebc8b..20de27678 100644
--- a/installer/resources/locale-man/man.pot
+++ b/installer/resources/locale-man/man.pot
@@ -20,23 +20,23 @@ msgstr ""
 #. type: TH
 #: man/eepget.1:1
 #, no-wrap
-msgid "EEEPGET"
+msgid "EEPGET"
 msgstr ""
 
 #. type: TH
-#: man/eepget.1:1
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
 #, no-wrap
-msgid "September 18, 2015"
+msgid "January 26, 2017"
 msgstr ""
 
 #. type: TH
-#: man/eepget.1:1
+#: man/eepget.1:1 man/i2prouter.1:1 man/i2prouter-nowrapper.1:1
 #, no-wrap
-msgid "Eepget - I2P Downloader"
+msgid "I2P"
 msgstr ""
 
 #. type: SH
-#: man/eepget.1:3 man/i2prouter.1:3
+#: man/eepget.1:3 man/i2prouter.1:3 man/i2prouter-nowrapper.1:3
 #, no-wrap
 msgid "NAME"
 msgstr ""
@@ -47,7 +47,7 @@ msgid "Eepget - I2P downloader"
 msgstr ""
 
 #. type: SH
-#: man/eepget.1:6 man/i2prouter.1:6
+#: man/eepget.1:6 man/i2prouter.1:6 man/i2prouter-nowrapper.1:6
 #, no-wrap
 msgid "SYNOPSIS"
 msgstr ""
@@ -58,7 +58,7 @@ msgid "B<eepget> [I<options>]I<URL>"
 msgstr ""
 
 #. type: SH
-#: man/eepget.1:11 man/i2prouter.1:11
+#: man/eepget.1:11 man/i2prouter.1:11 man/i2prouter-nowrapper.1:10
 #, no-wrap
 msgid "DESCRIPTION"
 msgstr ""
@@ -234,26 +234,27 @@ msgid ""
 msgstr ""
 
 #. type: SH
-#: man/eepget.1:94
+#: man/eepget.1:94 man/i2prouter.1:54 man/i2prouter-nowrapper.1:24
+#, no-wrap
+msgid "REPORTING BUGS"
+msgstr ""
+
+#. type: Plain text
+#: man/eepget.1:99 man/i2prouter.1:59 man/i2prouter-nowrapper.1:29
+msgid ""
+"Please enter a ticket on E<.UR https://trac.i2p2.de/> the I2P trac page "
+"E<.UE .>"
+msgstr ""
+
+#. type: SH
+#: man/eepget.1:100 man/i2prouter.1:60 man/i2prouter-nowrapper.1:30
 #, no-wrap
 msgid "SEE ALSO"
 msgstr ""
 
 #. type: Plain text
-#: man/eepget.1:97
-msgid "curl(1) wget(1)"
-msgstr ""
-
-#. type: TH
-#: man/i2prouter.1:1
-#, no-wrap
-msgid "i2prouter"
-msgstr ""
-
-#. type: TH
-#: man/i2prouter.1:1
-#, no-wrap
-msgid "January 26, 2017"
+#: man/eepget.1:104
+msgid "B<i2prouter>(1)  B<curl>(1)  B<wget>(1)"
 msgstr ""
 
 #. type: TH
@@ -385,6 +386,48 @@ msgid "B<dump>"
 msgstr ""
 
 #. type: Plain text
-#: man/i2prouter.1:52
+#: man/i2prouter.1:53
 msgid "Dumps the current threads into B<wrapper.log>."
 msgstr ""
+
+#. type: Plain text
+#: man/i2prouter.1:61
+msgid "B<i2prouter-nowrapper>(1)"
+msgstr ""
+
+#. type: TH
+#: man/i2prouter-nowrapper.1:1
+#, no-wrap
+msgid "I2PROUTER-NOWRAPPER"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:5
+msgid "i2prouter-nowrapper - start the I2P router"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:8
+msgid "B<i2prouter-nowrapper>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:14
+msgid ""
+"Start the I2P router, without the service wrapper.  This means the router "
+"will not restart if it crashes.  Also, it will use the default memory size, "
+"which may not be enough for I2P."
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:23
+msgid ""
+"You should really use the B<i2prouter>(1)  script instead.  There are no "
+"options.  To stop the router, use your browser to access E<.UR "
+"http://localhost:7657/> the router console E<.UE .>"
+msgstr ""
+
+#. type: Plain text
+#: man/i2prouter-nowrapper.1:31
+msgid "B<i2prouter>(1)"
+msgstr ""
diff --git a/installer/resources/man/eepget.1 b/installer/resources/man/eepget.1
index c24e0fe0c..53178e6b9 100644
--- a/installer/resources/man/eepget.1
+++ b/installer/resources/man/eepget.1
@@ -1,4 +1,4 @@
-.TH EEEPGET 1 "September 18, 2015" "" "Eepget - I2P Downloader"
+.TH EEPGET 1 "January 26, 2017" "" "I2P"
 
 .SH NAME
 Eepget \- I2P downloader
@@ -86,12 +86,19 @@ Sets the username for proxy authorization, if required.
 Sets the password for proxy authorization, if required. If a username is specified but not a password, EepGet will prompt for the password.
 .TP
 
-.SH EXIT STATUS
+.SH "EXIT STATUS"
 
 .B eepget
 exits with status zero upon successful transfer and non-zero if there were problems with the download.
 
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
 .SH "SEE ALSO"
-
-curl(1) wget(1)
+.BR i2prouter (1)
+.BR curl (1)
+.BR wget (1)
 
diff --git a/installer/resources/man/es/eepget.1 b/installer/resources/man/eepget.es.1
similarity index 100%
rename from installer/resources/man/es/eepget.1
rename to installer/resources/man/eepget.es.1
diff --git a/installer/resources/man/zh/eepget.1 b/installer/resources/man/eepget.zh.1
similarity index 100%
rename from installer/resources/man/zh/eepget.1
rename to installer/resources/man/eepget.zh.1
diff --git a/installer/resources/man/i2prouter-nowrapper.1 b/installer/resources/man/i2prouter-nowrapper.1
new file mode 100644
index 000000000..3d35bcf0b
--- /dev/null
+++ b/installer/resources/man/i2prouter-nowrapper.1
@@ -0,0 +1,31 @@
+.TH I2PROUTER-NOWRAPPER 1 "January 26, 2017" "" "I2P"
+
+.SH NAME
+i2prouter-nowrapper \- start the I2P router
+
+.SH SYNOPSIS
+.B i2prouter-nowrapper
+.br
+
+.SH DESCRIPTION
+Start the I2P router, without the service wrapper.
+This means the router will not restart if it crashes.
+Also, it will use the default memory size, which may not be enough for I2P.
+.P
+You should really use the
+.BR i2prouter (1)
+script instead.
+There are no options.
+To stop the router, use your browser to access
+.UR http://localhost:7657/
+the router console
+.UE .
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "SEE ALSO"
+.BR i2prouter (1)
diff --git a/installer/resources/man/i2prouter.1 b/installer/resources/man/i2prouter.1
index 76743c4d4..1aaed6155 100644
--- a/installer/resources/man/i2prouter.1
+++ b/installer/resources/man/i2prouter.1
@@ -1,4 +1,4 @@
-.TH i2prouter 1 "January 26, 2017" "" "I2PROUTER"
+.TH I2PROUTER 1 "January 26, 2017" "" "I2P"
 
 .SH NAME
 i2prouter \- start and stop the I2P router
@@ -50,3 +50,12 @@ Prints whether the I2P service is running.
 .B
 .IP dump
 Dumps the current threads into \fBwrapper.log\fP.
+
+.SH "REPORTING BUGS"
+Please enter a ticket on
+.UR https://trac.i2p2.de/
+the I2P trac page
+.UE .
+
+.SH "SEE ALSO"
+.BR i2prouter-nowrapper (1)
diff --git a/installer/resources/man/es/i2prouter.1 b/installer/resources/man/i2prouter.es.1
similarity index 100%
rename from installer/resources/man/es/i2prouter.1
rename to installer/resources/man/i2prouter.es.1
diff --git a/installer/resources/man/zh/i2prouter.1 b/installer/resources/man/i2prouter.zh.1
similarity index 100%
rename from installer/resources/man/zh/i2prouter.1
rename to installer/resources/man/i2prouter.zh.1
diff --git a/installer/resources/po4a.config b/installer/resources/po4a.config
index 9254a9e35..3216de742 100644
--- a/installer/resources/po4a.config
+++ b/installer/resources/po4a.config
@@ -1,9 +1,11 @@
 #
 # This is for translating the man pages.
 # po4a must be installed: sudo apt install po4a
-# Usage: po4a -M UTF-8 -L UTF-8 po4a.config
+# Usage: po4a -v -d -M UTF-8 -L UTF-8 po4a.config
 # See 'man po4a'
 #
 [po4a_paths] locale-man/man.pot $lang:locale-man/man_$lang.po
-[type:man] man/eepget.1 $lang:man/$lang/eepget.1
-[type:man] man/i2prouter.1 $lang:man/$lang/i2prouter.1
+[po4a_langs] es zh
+[type:man] man/eepget.1 $lang:man/eepget.$lang.1
+[type:man] man/i2prouter.1 $lang:man/i2prouter.$lang.1
+[type:man] man/i2prouter-nowrapper.1 $lang:man/i2prouter-nowrapper.$lang.1
diff --git a/installer/resources/poupdate-man.sh b/installer/resources/poupdate-man.sh
index 5d68873f5..ded02ad3e 100755
--- a/installer/resources/poupdate-man.sh
+++ b/installer/resources/poupdate-man.sh
@@ -2,10 +2,10 @@
 #
 # can't get po4a to do this
 #
-for i in eepget i2prouter
+for i in eepget i2prouter i2prouter-nowrapper
 do
 	for j in es zh
 	do
-		po4a-translate -f man -m man/$i.1 -p locale-man/man_$j.po -l man/$j/$i.1 -L UTF-8 -M UTF-8 -k 10 -v -d
+		po4a-translate -f man -m man/$i.1 -p locale-man/man_$j.po -l man/$i.$j.1 -L UTF-8 -M UTF-8 -k 10 -v -d
 	done
 done