diff -u apparmor-2.5.1/debian/changelog apparmor-2.5.1/debian/changelog
--- apparmor-2.5.1/debian/changelog
+++ apparmor-2.5.1/debian/changelog
@@ -20,8 +20,12 @@
     root_command_hook() for running apparmor_status (LP: #655529)
   * debian/apport/source_apparmor.py: use ProcKernelCmdline and don't clobber
     cmdline details (LP: #657091)
+  * debian/{rules,control}: move apache2 abstractions into the base package
+    so we can put apache2 profiles into the -profiles package without
+    aa-logprof bailing out. Patch by Marc Deslauriers.
+    (LP: #539441)
 
- -- Jamie Strandboge <jamie@ubuntu.com>  Wed, 13 Oct 2010 16:54:51 -0500
+ -- Jamie Strandboge <jamie@ubuntu.com>  Tue, 19 Oct 2010 15:36:21 -0500
 
 apparmor (2.5.1~rc1-0ubuntu2) maverick; urgency=low
 
diff -u apparmor-2.5.1/debian/control apparmor-2.5.1/debian/control
--- apparmor-2.5.1/debian/control
+++ apparmor-2.5.1/debian/control
@@ -11,7 +11,8 @@
 Package: apparmor
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, lsb-base, initramfs-tools, debconf
-Replaces: apparmor-parser
+Conflicts: libapache2-mod-apparmor (<< 2.5.1-0ubuntu0.10.10.1)
+Replaces: apparmor-parser, libapache2-mod-apparmor (<< 2.5.1-0ubuntu0.10.10.1)
 Suggests: apparmor-profiles, apparmor-docs
 Description: User-space parser utility for AppArmor
  AppArmor Parser is a user level programs that is used to load in program
diff -u apparmor-2.5.1/debian/rules apparmor-2.5.1/debian/rules
--- apparmor-2.5.1/debian/rules
+++ apparmor-2.5.1/debian/rules
@@ -189,11 +189,9 @@
 
 	# Move apache2 profile to libapache-mod-apparmor and create apache2.d directory
 	mkdir -p $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/apache2.d
-	mkdir -p $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/abstractions
 	mkdir -p $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/local
 	mv $(CURDIR)/debian/apparmor-profiles/etc/apparmor.d/usr.lib.apache2.mpm-prefork.apache2 $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/
 	mv $(CURDIR)/debian/apparmor-profiles/etc/apparmor.d/local/usr.lib.apache2.mpm-prefork.apache2 $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/local
-	mv $(CURDIR)/debian/apparmor/etc/apparmor.d/abstractions/apache2-* $(CURDIR)/debian/libapache2-mod-apparmor/etc/apparmor.d/abstractions/
 
 	# Remove these since the ntp package ships its own profile now
 	rm -f $(CURDIR)/debian/apparmor/etc/apparmor.d/tunables/ntpd