diff --git a/.gitignore b/.gitignore
index 3e61274bad..369d925a9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -98,6 +98,11 @@
 /doc/tor.html
 /doc/tor.html.in
 /doc/tor.1.xml
+/doc/tor-fw-helper.1
+/doc/tor-fw-helper.1.in
+/doc/tor-fw-helper.html
+/doc/tor-fw-helper.html.in
+/doc/tor-fw-helper.1.xml
 /doc/tor-gencert.1
 /doc/tor-gencert.1.in
 /doc/tor-gencert.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 68747c8d2d..500a57c7b6 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -14,7 +14,11 @@
 # just use the .1 and .html files.
 
 if USE_ASCIIDOC
+if USE_FW_HELPER
+asciidoc_files = tor tor-gencert tor-resolve torify tor-fw-helper
+else
 asciidoc_files = tor tor-gencert tor-resolve torify
+endif
 html_in = $(asciidoc_files:=.html.in)
 man_in = $(asciidoc_files:=.1.in)
 txt_in = $(asciidoc_files:=.1.txt)
@@ -51,6 +55,7 @@ tor.html.in : tor.1.txt
 torify.html.in : torify.1.txt
 tor-gencert.html.in : tor-gencert.1.txt
 tor-resolve.html.in : tor-resolve.1.txt
+tor-fw-helper.html.in : tor-fw-helper.1.txt
 
 # Generate the manpage from asciidoc, but don't do
 # machine-specific replacements yet
@@ -61,6 +66,7 @@ tor.1.in : tor.1.txt
 torify.1.in : torify.1.txt
 tor-gencert.1.in : tor-gencert.1.txt
 tor-resolve.1.in : tor-resolve.1.txt
+tor-fw-helper.1.in : tor-fw-helper.1.txt
 
 # use ../config.status to swap all machine-specific magic strings
 # in the asciidoc with their replacements.
@@ -74,10 +80,12 @@ tor.1 : tor.1.in
 torify.1 : torify.1.in
 tor-gencert.1 : tor-gencert.1.in
 tor-resolve.1 : tor-resolve.1.in
+tor-fw-helper.1 : tor-fw-helper.1.in
 tor.html : tor.html.in
 torify.html : torify.html.in
 tor-gencert.html : tor-gencert.html.in
 tor-resolve.html : tor-resolve.html.in
+tor-fw-helper.html : tor-fw-helper.html.in
 
 CLEANFILES = $(asciidoc_product) config.log
 DISTCLEANFILES = $(html_in) $(man_in)
diff --git a/doc/asciidoc-helper.sh b/doc/asciidoc-helper.sh
index 00f8b8d07f..33e1360a71 100755
--- a/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@ -17,6 +17,7 @@ output=$3
 if [ "$1" = "html" ]; then
     input=${output%%.html.in}.1.txt
     base=${output%%.html.in}
+
     if [ "$2" != none ]; then
       "$2" -d manpage -o $output $input;
     else
@@ -32,7 +33,7 @@ if [ "$1" = "html" ]; then
 elif [ "$1" = "man" ]; then
     input=${output%%.1.in}.1.txt
     base=${output%%.1.in}
-    
+
     if test "$2" = none; then
       echo "==================================";
       echo;
diff --git a/doc/tor-fw-helper.1.txt b/doc/tor-fw-helper.1.txt
index 87607afb8a..49b0910380 100644
--- a/doc/tor-fw-helper.1.txt
+++ b/doc/tor-fw-helper.1.txt
@@ -3,7 +3,7 @@
 // This is an asciidoc file used to generate the manpage/html reference.
 // Learn asciidoc on http://www.methods.co.nz/asciidoc/userguide.html
 tor-fw-helper(1)
-==============
+================
 Jacob Appelbaum
 
 NAME
@@ -13,8 +13,8 @@ tor-fw-helper - Manage upstream firewall/NAT devices
 SYNOPSIS
 --------
 **tor-fw-helper** [-h|--help] [-T|--test] [-v|--verbose] [-g|--fetch-public-ip]
--i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_]
-[-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_]
+ -i|--internal-or-port __TCP port__ [-e|--external-or-port _TCP port_]
+ [-d|--internal-dir-port _TCP port_] [-p|--external-dir-port _TCP port_]
 
 DESCRIPTION
 -----------