diff --git a/debian/changelog b/debian/changelog
index bb9167a9..ac3cf847 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,9 @@ shadow (1:4.1.5-1) UNRELEASED; urgency=low
   * debian/securetty.linux: Reorganize and synchronize with
     Documentation/devices.txt. This added a lot of TTYs, including the
     ttyPZ0..3. Closes: #576203
+  * debian/rules, debian/man.insert, debian/man.insert.sed: Hack to avoid bug
+    507673, causing missing apostrophes in the manpages generated by
+    docbook-xsl.
 
  -- Nicolas FRANCOIS (Nekral) <nicolas.francois@centraliens.net>  Sun, 24 Jan 2010 18:28:33 +0100
 
diff --git a/debian/man.insert b/debian/man.insert
new file mode 100644
index 00000000..7ea8412a
--- /dev/null
+++ b/debian/man.insert
@@ -0,0 +1,3 @@
+.\" http://bugs.debian.org/507673
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
diff --git a/debian/man.insert.sed b/debian/man.insert.sed
new file mode 100644
index 00000000..7c298dde
--- /dev/null
+++ b/debian/man.insert.sed
@@ -0,0 +1,2 @@
+/^\.TH/{r debian/man.insert
+}
diff --git a/debian/rules b/debian/rules
index 18d14f0a..7d7c4a17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,10 @@ else
 endif
 export CFLAGS
 
+common-build-arch::
+	# Waiting for http://bugs.debian.org/507673
+	sed -i -f debian/man.insert.sed man/*.[0-9] man/*/*.[0-9]
+
 # Add extras to the install process:
 binary-install/login::
 	dh_installpam -p login