diff --git a/Makefile b/Makefile
index 43a4333cf1..e38a3d619c 100644
--- a/Makefile
+++ b/Makefile
@@ -114,6 +114,10 @@ endif
 
 upload:		$(FIRMWARE_BUNDLE) $(UPLOADER)
 	@python -u $(UPLOADER) --port $(SERIAL_PORTS) $(FIRMWARE_BUNDLE)
+	
+upload-jtag-px4fmu:
+	@echo Attempting to flash PX4FMU board via JTAG
+	@openocd -f interface/olimex-jtag-tiny.cfg -f Tools/stm32f4x.cfg -c init -c "reset halt" -c "flash write_image erase nuttx/nuttx" -c "flash write_image erase ../Bootloader/px4fmu_bl.elf" -c "reset run" -c shutdown
 
 #
 # Hacks and fixups
@@ -129,7 +133,7 @@ endif
 # a complete re-compilation, 'distclean' should remove everything 
 # that's generated leaving only files that are in source control.
 #
-.PHONY:	clean
+.PHONY:	clean upload-jtag-px4fmu
 clean:
 	@make -C $(NUTTX_SRC) -r $(MQUIET) distclean
 	@make -C $(ROMFS_SRC) -r $(MQUIET) clean
diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index 7ebd37e750..2b5a6edde9 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -263,8 +263,8 @@ class uploader(object):
 		print("program...")
 		self.__program(fw)
 
-		print("verify...")
-		self.__verify(fw)
+		#print("verify...")
+		#self.__verify(fw)
 
 		print("done, rebooting.")
 		self.__reboot()
@@ -290,18 +290,7 @@ while True:
 
 		# create an uploader attached to the port
 		try:
-			if "linux" in _platform:
-			# Linux, don't open Mac OS and Win ports
-				if not "COM" in port and not "tty.usb" in port:
-					up = uploader(port, args.baud)
-			elif "darwin" in _platform:
-				# OS X, don't open Windows and Linux ports
-				if not "COM" in port and not "ACM" in port:
-					up = uploader(port, args.baud)
-			elif "win" in _platform:
-				# Windows, don't open POSIX ports
-				if not "/" in port:
-					up = uploader(port, args.baud)
+			up = uploader("\\\\.\\COM2", args.baud)
 		except:
 			# open failed, rate-limit our attempts
 			time.sleep(0.05)