diff -u bcmwl-5.100.82.38+bdcom/debian/changelog bcmwl-5.100.82.38+bdcom/debian/changelog
--- bcmwl-5.100.82.38+bdcom/debian/changelog
+++ bcmwl-5.100.82.38+bdcom/debian/changelog
@@ -1,3 +1,21 @@
+bcmwl (5.100.82.38+bdcom-0ubuntu3.2) natty-proposed; urgency=low
+
+  * debian/bcmwl-kernel-source.postinst: fix merge mistake in the previous
+    revision resulting in failure to install (LP: #793890)
+
+ -- Daniel van Vugt <vanvugt@gmail.com>  Fri, 08 Jul 2011 11:42:26 +0800
+
+bcmwl (5.100.82.38+bdcom-0ubuntu3.1) natty-proposed; urgency=low
+
+  [ Daniel van Vugt ]
+  * debian/bcmwl-kernel-source.prerm:
+    - Don't error out if we can't remove bcmwl module.  LP: #776439
+  * debian/bcmwl-kernel-source.postinst:
+    - Unconditionally update the blacklist (i.e. even on upgrade).
+      LP: #776165
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Fri, 03 Jun 2011 11:45:25 +1000
+
 bcmwl (5.100.82.38+bdcom-0ubuntu3) natty; urgency=low
 
   * debian/bcmwl-kernel-source.postinst: Also blacklist brcm80211, to ensure
diff -u bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.postinst bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.postinst
--- bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.postinst
+++ bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.postinst
@@ -35,8 +35,7 @@
 	/usr/lib/dkms/common.postinst $PACKAGE_NAME $CVERSION /usr/share/$PACKAGE_NAME $ARCH $2
 	
 	# Create a blacklist file
-	if [ ! -f $BLACKLIST_FILE ]; then
-		cat > $BLACKLIST_FILE <<EOF
+	cat > $BLACKLIST_FILE <<EOF
 # Warning: This file is autogenerated by $PACKAGE_NAME. All changes to this file will be lost.
 blacklist b43
 blacklist b43legacy
@@ -44,13 +43,12 @@
 blacklist bcm43xx
 blacklist brcm80211
 EOF
-		# If b44 is loaded, append these additional lines
-		if lsmod | grep b44 > /dev/null; then
-			cat >> $BLACKLIST_FILE <<EOF
+	# If b44 is loaded, append these additional lines
+	if lsmod | grep b44 > /dev/null; then
+		cat >> $BLACKLIST_FILE <<EOF
 blacklist b44
 install wl modprobe -r b43 b44 b43legacy ssb; modprobe --ignore-install wl $CMDLINE_OPTS; modprobe --ignore-install b44
 EOF
-		fi
 	fi
 	
 	# Update initramfs
diff -u bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.prerm bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.prerm
--- bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.prerm
+++ bcmwl-5.100.82.38+bdcom/debian/bcmwl-kernel-source.prerm
@@ -10,8 +10,10 @@
 CVERSION=`dpkg-query -W -f='${Version}' bcmwl-kernel-source | awk -F "-" '{print $1}' | cut -d\: -f2`
 case "$1" in
     remove|upgrade)
-		echo "Removing all DKMS Modules"
-		dkms remove -m bcmwl -v $CVERSION --all > /dev/null
+		count=`dkms status -m bcmwl -v $CVERSION | wc -l`
+		echo "Removing all DKMS Modules ($count)"
+		[ $count -le 0 ] && true ||
+			dkms remove -m bcmwl -v $CVERSION --all > /dev/null
 		echo "Done."
         ;;
 esac