diff --git a/debian/changelog b/debian/changelog
index 4dc871e..09bfd34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ python-os-testr (0.6.0-1) unstable; urgency=medium
   * Uploading to unstable.
   * Standards-Version: 3.9.7 (no change).
   * Fixed debian/copyright ordering.
+  * Added generate-subunit to the pool of update-alternatives managed command
+    line programs.
 
  -- Thomas Goirand <zigo@debian.org>  Mon, 04 Apr 2016 09:00:23 +0000
 
diff --git a/debian/python-os-testr.postinst b/debian/python-os-testr.postinst
index 7369d19..bbaca68 100644
--- a/debian/python-os-testr.postinst
+++ b/debian/python-os-testr.postinst
@@ -6,6 +6,7 @@ if [ "$1" = "configure" ] ; then
 	update-alternatives --install /usr/bin/ostestr ostestr /usr/bin/python2-ostestr 300
 	update-alternatives --install /usr/bin/subunit-trace subunit-trace /usr/bin/python2-subunit-trace 300
 	update-alternatives --install /usr/bin/subunit2html subunit2html /usr/bin/python2-subunit2html 300
+	update-alternatives --install /usr/bin/generate-subunit generate-subunit /usr/bin/python2-generate-subunit 300
 fi
 
 #DEBHELPER#
diff --git a/debian/python-os-testr.postrm b/debian/python-os-testr.postrm
new file mode 100644
index 0000000..f45ecb7
--- /dev/null
+++ b/debian/python-os-testr.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove ostestr /usr/bin/python2-ostestr
+	update-alternatives --remove subunit-trace /usr/bin/python2-subunit-trace
+	update-alternatives --remove subunit2html /usr/bin/python2-subunit2html
+	update-alternatives --remove generate-subunit /usr/bin/python2-generate-subunit
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python-os-testr.prerm b/debian/python-os-testr.prerm
index e9a7ec2..9cf1b9f 100644
--- a/debian/python-os-testr.prerm
+++ b/debian/python-os-testr.prerm
@@ -6,6 +6,7 @@ if [ "$1" = "remove" ] ; then
 	update-alternatives --remove ostestr /usr/bin/python2-ostestr
 	update-alternatives --remove subunit-trace /usr/bin/python2-subunit-trace
 	update-alternatives --remove subunit2html /usr/bin/python2-subunit2html
+	update-alternatives --remove generate-subunit /usr/bin/python2-generate-subunit
 fi
 
 #DEBHELPER#
diff --git a/debian/python3-os-testr.postinst b/debian/python3-os-testr.postinst
index 2720a89..3afde18 100644
--- a/debian/python3-os-testr.postinst
+++ b/debian/python3-os-testr.postinst
@@ -6,6 +6,7 @@ if [ "$1" = "configure" ] ; then
 	update-alternatives --install /usr/bin/ostestr ostestr /usr/bin/python3-ostestr 200
 	update-alternatives --install /usr/bin/subunit-trace subunit-trace /usr/bin/python3-subunit-trace 200
 	update-alternatives --install /usr/bin/subunit2html subunit2html /usr/bin/python3-subunit2html 200
+	update-alternatives --install /usr/bin/generate-subunit generate-subunit /usr/bin/python3-generate-subunit 200
 fi
 
 #DEBHELPER#
diff --git a/debian/python3-os-testr.postrm b/debian/python3-os-testr.postrm
new file mode 100644
index 0000000..59fe9af
--- /dev/null
+++ b/debian/python3-os-testr.postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "remove" ] || [ "$1" = "disappear" ] ; then
+	update-alternatives --remove ostestr /usr/bin/python3-ostestr
+	update-alternatives --remove subunit-trace /usr/bin/python3-subunit-trace
+	update-alternatives --remove subunit2html /usr/bin/python3-subunit2html
+	update-alternatives --remove generate-subunit /usr/bin/python3-generate-subunit
+fi
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/python3-os-testr.prerm b/debian/python3-os-testr.prerm
index 4dbbea5..d4f771c 100644
--- a/debian/python3-os-testr.prerm
+++ b/debian/python3-os-testr.prerm
@@ -6,6 +6,7 @@ if [ "$1" = "remove" ] ; then
 	update-alternatives --remove ostestr /usr/bin/python3-ostestr
 	update-alternatives --remove subunit-trace /usr/bin/python3-subunit-trace
 	update-alternatives --remove subunit2html /usr/bin/python3-subunit2html
+	update-alternatives --remove generate-subunit /usr/bin/python3-generate-subunit
 fi
 
 #DEBHELPER#
diff --git a/debian/rules b/debian/rules
index a08f620..01578b8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,8 @@ override_dh_install:
 	mv $(CURDIR)/debian/python3-os-testr/usr/bin/subunit-trace $(CURDIR)/debian/python3-os-testr/usr/bin/python3-subunit-trace
 	mv $(CURDIR)/debian/python-os-testr/usr/bin/subunit2html $(CURDIR)/debian/python-os-testr/usr/bin/python2-subunit2html
 	mv $(CURDIR)/debian/python3-os-testr/usr/bin/subunit2html $(CURDIR)/debian/python3-os-testr/usr/bin/python3-subunit2html
+	mv $(CURDIR)/debian/python-os-testr/usr/bin/generate-subunit $(CURDIR)/debian/python-os-testr/usr/bin/python2-generate-subunit
+	mv $(CURDIR)/debian/python3-os-testr/usr/bin/generate-subunit $(CURDIR)/debian/python3-os-testr/usr/bin/python3-generate-subunit
 
 override_dh_python3:
 	dh_python3 --shebang=/usr/bin/python3