diff -Nru sshuttle-0.54/debian/changelog sshuttle-0.54/debian/changelog
--- sshuttle-0.54/debian/changelog	2011-08-08 18:21:38.000000000 +0000
+++ sshuttle-0.54/debian/changelog	2012-03-31 09:30:05.000000000 +0000
@@ -1,3 +1,11 @@
+sshuttle (0.54-2) unstable; urgency=low
+
+  * debian/rules: Post-process pandoc result since it converts double dashes
+   to emphasized output and this is not rendered properly in the manpage
+   (Closes: #666265)
+
+ -- Javier Fernández-Sanguino Peña <jfs@debian.org>  Sat, 31 Mar 2012 11:25:25 +0200
+
 sshuttle (0.54-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru sshuttle-0.54/debian/control sshuttle-0.54/debian/control
--- sshuttle-0.54/debian/control	2011-06-12 21:36:18.000000000 +0000
+++ sshuttle-0.54/debian/control	2012-03-31 09:30:54.000000000 +0000
@@ -1,7 +1,7 @@
 Source: sshuttle
 Section: net
 Priority: extra
-Maintainer: Javier Fernandez-Sanguino Pen~a <jfs@debian.org>
+Maintainer: Javier Fernández-Sanguino Peña <jfs@debian.org>
 Uploaders: Miguel Landaeta <miguel@miguel.cc> 
 Build-Depends: debhelper (>= 7.0.50~), pandoc, python (>= 2.6.6-3~)
 Standards-Version: 3.9.2
diff -Nru sshuttle-0.54/debian/rules sshuttle-0.54/debian/rules
--- sshuttle-0.54/debian/rules	2011-06-12 21:36:18.000000000 +0000
+++ sshuttle-0.54/debian/rules	2012-03-31 09:25:17.000000000 +0000
@@ -7,7 +7,9 @@
 override_dh_auto_test:
 
 override_dh_auto_build:
-	pandoc -s -r markdown -w man -o sshuttle.8 sshuttle.md
+	pandoc -s -r markdown -w man -o sshuttle_fix.8 sshuttle.md
+	cat sshuttle_fix.8 | sed -e 's/\\\[em\]/--/g' >sshuttle.8
+	-rm -f sshuttle_fix.8
 
 override_dh_install:
 	dh_install -Xstresstest.py