diff -u nspluginwrapper-1.4.2/debian/changelog nspluginwrapper-1.4.2/debian/changelog
--- nspluginwrapper-1.4.2/debian/changelog
+++ nspluginwrapper-1.4.2/debian/changelog
@@ -1,3 +1,14 @@
+nspluginwrapper (1.4.2-0ubuntu0.11.04.0~md2) natty; urgency=low
+
+  * flashplugin-nonfree is installed in a non-standard location to support
+    alternatives. When nspluginwrapper tries to refresh all the wrapped
+    plugins, it will misdetect flash and break it.
+    - debian/nspluginwrapper.postinst: remove old unneeded upgrade
+      handling. Add logic to handle flashplugin-nonfree properly during
+      plugin refresh.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 23 Jun 2011 15:28:02 -0400
+
 nspluginwrapper (1.4.2-0ubuntu0.11.04.0~md1) natty; urgency=low
 
   * New upstream version 1.4.2
diff -u nspluginwrapper-1.4.2/debian/nspluginwrapper.postinst nspluginwrapper-1.4.2/debian/nspluginwrapper.postinst
--- nspluginwrapper-1.4.2/debian/nspluginwrapper.postinst
+++ nspluginwrapper-1.4.2/debian/nspluginwrapper.postinst
@@ -14,13 +14,24 @@
 		export NSPLUGIN_DIRS
 		if test -x /usr/bin/nspluginwrapper; then
 			nspluginwrapper -a -v -u
-		fi
 
-		if dpkg --compare-versions "$2" lt "1.2.2-0ubuntu5"; then
-			rm -rf /usr/lib/mozilla/plugins/npwrapper.*.so \
-				/usr/lib/firefox/plugins/npwrapper.*.so \
-				/usr/lib/seamonkey/plugins/npwrapper.*.so \
-				/usr/lib/iceweasel/plugins/npwrapper.*.so
+			# flashplugin-nonfree is installed in a non-standard location.
+			# When nspluginwrapper tries to refresh all the wrapped
+			# plugins, it will misdetect flash and break it. This
+			# will restore functionnality.
+
+		  	if test -f /usr/lib/flashplugin-installer/libflashplayer.so; then
+				VARIANTS="iceape iceweasel mozilla firefox xulrunner midbrowser xulrunner-addons"
+				NSPLUGIN_DIR=/var/lib/flashplugin-installer/ /usr/bin/nspluginwrapper -n -i /usr/lib/flashplugin-installer/libflashplayer.so
+				for p in $VARIANTS; do 
+					update-alternatives --quiet --install "/usr/lib/$p/plugins/flashplugin-alternative.so" "$p-flashplugin" /var/lib/flashplugin-installer/npwrapper.libflashplayer.so 50
+					if readlink /etc/alternatives/"$p-flashplugin" | grep -c flashplugin-nonfree >/dev/null; then
+						update-alternatives --quiet --set "$p-flashplugin" /var/lib/flashplugin-installer/npwrapper.libflashplayer.so
+					fi
+				done
+				rm -f /usr/lib/nspluginwrapper/plugins/npwrapper.libflashplayer.so
+				ln -sf /usr/lib/flashplugin-installer/npwrapper.libflashplayer.so /usr/share/ubufox/plugins
+			fi
 		fi
         ;;