diff --git a/debian/changelog b/debian/changelog
index 050ede35..a40c6931 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ ostree (2016.5-1) UNRELEASED; urgency=medium
     positives
   * Run dh_auto_test with VERBOSE=1, to get logs with older debhelper
   * Build-depend on elfutils, for test-abi.sh
+  * Work around #821235 to avoid undefined macro 'AQ' in some man pages
 
  -- Simon McVittie <smcv@debian.org>  Mon, 28 Mar 2016 12:02:59 +0100
 
diff --git a/debian/rules b/debian/rules
index f89209ef..1141b41a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,6 +35,15 @@ override_dh_auto_test:
 		pgrep lt-ostree | xargs --no-run-if-empty ps ww; \
 	fi
 
+override_dh_auto_install:
+	dh_auto_install
+	# docbook-xsl capitalizes the whole heading, including the macro
+	# used to represent a single quote... https://bugs.debian.org/821235
+	sed -i -e 's,\*(AQ,*(Aq,g' \
+		debian/tmp/usr/share/man/man1/ostree-remote.1 \
+		debian/tmp/usr/share/man/man1/ostree-static-delta.1 \
+		$(NULL)
+
 override_dh_install:
 	rm -f debian/tmp/usr/lib/*/*.la
 	rm -f debian/tmp/usr/lib/installed-tests/ostree/*.la