diff --git a/Makefile b/Makefile
index 135caf23..2e7808fc 100644
--- a/Makefile
+++ b/Makefile
@@ -130,18 +130,15 @@ notify: init
 
 
 # Zip up the jQm files without docs
-zip: init css js 
+zip: init css js
 	# Packaging up the files into a zip archive
 	@@mkdir tmp
-	@@cp -R ${OUTPUT} tmp/${NAME} 
+	@@cp -R ${OUTPUT} tmp/${NAME}
 	# ... And remove the Zipped docs so they aren't included twice (for deploy scripts)
-	@@rm -rf tmp/${NAME}/${NAME}.docs.zip 
+	@@rm -rf tmp/${NAME}/${NAME}.docs.zip
 	@@cd tmp; zip -rq ../${OUTPUT}/${NAME}.zip ${NAME}
 	@@rm -rf tmp
 	# -------------------------------------------------
-	
-
-
 
 # -------------------------------------------------
 # -------------------------------------------------
@@ -158,7 +155,7 @@ latest: init css docs js zip
 	# -------------------------------------------------
 
 # Build the nightly backups. This is done on a server cronjob
-nightlies: init css js docs zip 
+nightlies: init css js docs zip
 	# Time to put these on the CDN
 	@@mkdir -p tmp/nightlies
 	@@mv ${OUTPUT} tmp/nightlies/$$(date "+%Y%m%d")
@@ -178,12 +175,13 @@ deploy: init css js docs zip
 	@@mv ${OUTPUT}/demos tmp/${VER_OFFICIAL}
 	# Create the Demos/Docs/Tests/Tools for jQueryMobile.com
 	# ... By first replacing the paths
+	# TODO update jQuery Version replacement on deploy
 	@@find tmp/${VER_OFFICIAL} -type f \
 		\( -name '*.html' -o -name '*.php' \) \
 		-exec perl -pi -e \
-		's|src="(.*)${NAME}.min.js"|src="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.js"|g;s|href="(.*)${NAME}.min.css"|href="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.css"|g;s|src="(.*)jquery.js"|src="//code.jquery.com/jquery-1.6.4.js"|g' {} \;
+		's|src="(.*)${NAME}.min.js"|src="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.js"|g;s|href="(.*)${NAME}.min.css"|href="//code.jquery.com/mobile/${VER_OFFICIAL}/${NAME}.min.css"|g;s|src="(.*)jquery.js"|src="//code.jquery.com/jquery-1.6.4.min.js"|g' {} \;
 	# ... So they can be copied to jquerymobile.com
-	@@scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/	
+	@@scp -qr tmp/* jqadmin@jquerymobile.com:/srv/jquerymobile.com/htdocs/demos/
 	# Do some cleanup to wrap it up
 	@@rm -rf tmp
 	@@rm -rf ${OUTPUT}
diff --git a/js/jquery.mobile.event.js b/js/jquery.mobile.event.js
index f32329cc..083ed55a 100644
--- a/js/jquery.mobile.event.js
+++ b/js/jquery.mobile.event.js
@@ -92,8 +92,8 @@ $.event.special.tap = {
 				clearTapTimer();
 
 				$this.unbind( "vclick", clickHandler )
-					.unbind( "vmouseup", clearTapTimer )
-					.unbind( "vmousecancel", clearTapHandlers );
+					.unbind( "vmouseup", clearTapTimer );
+				$( document ).unbind( "vmousecancel", clearTapHandlers );
 			}
 
 			function clickHandler(event) {
@@ -106,9 +106,9 @@ $.event.special.tap = {
 				}
 			}
 
-			$this.bind( "vmousecancel", clearTapHandlers )
-				.bind( "vmouseup", clearTapTimer )
+			$this.bind( "vmouseup", clearTapTimer )
 				.bind( "vclick", clickHandler );
+			$( document ).bind( "vmousecancel", clearTapHandlers );
 
 			timer = setTimeout(function() {
 					triggerCustomEvent( thisObject, "taphold", $.Event( "taphold" ) );