diff -Nru debhelper-9.20120115ubuntu2/autoscripts/postinst-apparmor debhelper-9.20120115ubuntu3/autoscripts/postinst-apparmor
--- debhelper-9.20120115ubuntu2/autoscripts/postinst-apparmor	2012-01-23 12:59:35.000000000 +0000
+++ debhelper-9.20120115ubuntu3/autoscripts/postinst-apparmor	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-if [ "$1" = "configure" ]; then
-    APP_PROFILE=/etc/apparmor.d/#PROFILE#
-    if [ -f "$APP_PROFILE" ]; then
-        # Add the local/ include
-        LOCAL_APP_PROFILE=/etc/apparmor.d/local/#PROFILE#
-
-        test -e "$LOCAL_APP_PROFILE" || {
-            tmp=`mktemp`
-        cat <<EOM > "$tmp"
-# Site-specific additions and overrides for #PROFILE#.
-# For more details, please see /etc/apparmor.d/local/README.
-EOM
-            mkdir `dirname $LOCAL_APP_PROFILE` 2>/dev/null || true
-            mv -f "$tmp" "$LOCAL_APP_PROFILE"
-            chmod 644 "$LOCAL_APP_PROFILE"
-        }
-
-        # Reload the profile, including any abstraction updates
-        if aa-status --enabled 2>/dev/null; then
-            apparmor_parser -r -T -W "$APP_PROFILE" || true
-        fi
-    fi
-fi
diff -Nru debhelper-9.20120115ubuntu2/autoscripts/postrm-apparmor debhelper-9.20120115ubuntu3/autoscripts/postrm-apparmor
--- debhelper-9.20120115ubuntu2/autoscripts/postrm-apparmor	2012-01-23 12:59:35.000000000 +0000
+++ debhelper-9.20120115ubuntu3/autoscripts/postrm-apparmor	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-if [ "$1" = "purge" ]; then
-    rm -f "/etc/apparmor.d/disable/#PROFILE#" || true
-    rm -f "/etc/apparmor.d/force-complain/#PROFILE#" || true
-    rm -f "/etc/apparmor.d/local/#PROFILE#" || true
-    rmdir /etc/apparmor.d/local 2>/dev/null || true
-fi
diff -Nru debhelper-9.20120115ubuntu2/debian/changelog debhelper-9.20120115ubuntu3/debian/changelog
--- debhelper-9.20120115ubuntu2/debian/changelog	2012-01-24 00:12:28.000000000 +0000
+++ debhelper-9.20120115ubuntu3/debian/changelog	2012-03-02 14:13:38.000000000 +0000
@@ -1,3 +1,11 @@
+debhelper (9.20120115ubuntu3) precise; urgency=low
+
+  * remove dh_apparmor and corresponding autoscripts and adjust debian/control
+    to Depends on dh-apparmor. This can be dropped once all packages that use
+    dh_apparmor Build-Depends on dh-apparmor.
+
+ -- Jamie Strandboge <jamie@ubuntu.com>  Fri, 02 Mar 2012 08:13:33 -0600
+
 debhelper (9.20120115ubuntu2) precise; urgency=low
 
   * Make dh_apparmor executable again.
diff -Nru debhelper-9.20120115ubuntu2/debian/control debhelper-9.20120115ubuntu3/debian/control
--- debhelper-9.20120115ubuntu2/debian/control	2012-01-23 12:59:35.000000000 +0000
+++ debhelper-9.20120115ubuntu3/debian/control	2012-02-15 22:54:05.000000000 +0000
@@ -12,7 +12,7 @@
 Package: debhelper
 Architecture: all
 Multi-Arch: foreign
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.16.0), html2text, binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg-dev (>= 1.16.0), html2text, binutils, po-debconf, man-db (>= 2.5.1-1), dh-apparmor
 Suggests: dh-make
 Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6)
 Description: helper programs for debian/rules
diff -Nru debhelper-9.20120115ubuntu2/dh_apparmor debhelper-9.20120115ubuntu3/dh_apparmor
--- debhelper-9.20120115ubuntu2/dh_apparmor	2012-01-23 12:59:35.000000000 +0000
+++ debhelper-9.20120115ubuntu3/dh_apparmor	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-#!/usr/bin/perl -w
-
-=head1 NAME
-
-dh_apparmor - reload AppArmor profile and create local include
-
-=cut
-
-use strict;
-use Debian::Debhelper::Dh_Lib;
-
-=head1 SYNOPSIS
-
-B<dh_apparmor> B<--profile-name=>I<profilename>
-
-=head1 DESCRIPTION
-
-dh_apparmor is a debhelper program that will create/remove the
-/etc/apparmor.d/local/<profilename> include file in maintainer scripts. It
-also reloads the specified AppArmor profile in postinst using:
-
-=over 4
-
-apparmor_parser -r -W -T /etc/apparmor.d/<profilename>
-
-=back
-
-By using '-W -T' we ensure that any abstraction updates are also pulled in.
-
-=head1 OPTIONS
-
-=over 4
-
-=item B<--profile-name=><profilename>
-
-Specify the profile name.
-
-=back
-
-=head1 NOTES
-
-Note that for packages that have multiple binary packages, you will want to
-pass '-p<package name>' to dh_apparmor, otherwise dh_apparmor will add
-AppArmor reload commands for all packages rather than just the one that
-ships the profile.
-
-=cut
-
-init(options => {
-	"profile-name=s" => \$dh{PROFILE_NAME},
-});
-
-foreach my $package (@{$dh{DOPACKAGES}}) {
-	if (! $dh{PROFILE_NAME}) {
-		error("Must specify --profile-name");
-        }
-        my $pname = $dh{PROFILE_NAME};
-	autoscript($package,"postinst","postinst-apparmor","s/#PROFILE#/$pname/");
-	autoscript($package,"postrm","postrm-apparmor","s/#PROFILE#/$pname/");
-}
-
-=head1 SEE ALSO
-
-L<debhelper>
-
-This program is a part of debhelper.
-
-=head1 AUTHOR
-
-Jamie Strandboge <jamie@canonical.com>
-
-=cut