diff --git a/Makefile b/Makefile
index 46190c1f5..c95ff7d13 100644
--- a/Makefile
+++ b/Makefile
@@ -283,7 +283,7 @@ libusb_win_clean:
 
 openocd_git_win_install: | $(DL_DIR) $(TOOLS_DIR)
 openocd_git_win_install: OPENOCD_URL  := git://openocd.git.sourceforge.net/gitroot/openocd/openocd
-openocd_git_win_install: OPENOCD_REV  := c59a4419fcc5568d59fbaee775132f91cb7fd26b
+openocd_git_win_install: OPENOCD_REV  := f1c0133321c8fcadadd10bba5537c0a634eb183b
 openocd_git_win_install: openocd_win_clean libusb_win_install ftd2xx_install
         # download the source
 	$(V0) @echo " DOWNLOAD     $(OPENOCD_URL) @ $(OPENOCD_REV)"
@@ -332,7 +332,7 @@ openocd_win_clean:
 
 openocd_git_install: | $(DL_DIR) $(TOOLS_DIR)
 openocd_git_install: OPENOCD_URL  := git://openocd.git.sourceforge.net/gitroot/openocd/openocd
-openocd_git_install: OPENOCD_REV  := c59a4419fcc5568d59fbaee775132f91cb7fd26b
+openocd_git_install: OPENOCD_REV  := f1c0133321c8fcadadd10bba5537c0a634eb183b
 openocd_git_install: openocd_clean
         # download the source
 	$(V0) @echo " DOWNLOAD     $(OPENOCD_URL) @ $(OPENOCD_REV)"
diff --git a/flight/Project/OpenOCD/0001-armv7m-remove-dummy-FP-regs-for-new-gdb.patch b/flight/Project/OpenOCD/0001-armv7m-remove-dummy-FP-regs-for-new-gdb.patch
index 85db22e44..e5981e1e2 100644
--- a/flight/Project/OpenOCD/0001-armv7m-remove-dummy-FP-regs-for-new-gdb.patch
+++ b/flight/Project/OpenOCD/0001-armv7m-remove-dummy-FP-regs-for-new-gdb.patch
@@ -1,4 +1,4 @@
-From 8fd5040df32511f57b898bdbff412f61fbe28516 Mon Sep 17 00:00:00 2001
+From 07081d82193928ffd0b45df446546f0a41373db7 Mon Sep 17 00:00:00 2001
 From: Stacey Sheldon <stac@solidgoldbomb.org>
 Date: Thu, 2 Feb 2012 22:42:03 -0500
 Subject: [PATCH 1/2] armv7m: remove dummy FP regs for new gdb
@@ -75,5 +75,5 @@ index 258653e..50b26d4 100644
  }
  
 -- 
-1.7.1
+1.7.5.4
 
diff --git a/flight/Project/OpenOCD/0002-rtos-add-stm32_stlink-to-FreeRTOS-targets.patch b/flight/Project/OpenOCD/0002-rtos-add-stm32_stlink-to-FreeRTOS-targets.patch
index f299c7ff2..6140a4bb1 100644
--- a/flight/Project/OpenOCD/0002-rtos-add-stm32_stlink-to-FreeRTOS-targets.patch
+++ b/flight/Project/OpenOCD/0002-rtos-add-stm32_stlink-to-FreeRTOS-targets.patch
@@ -1,4 +1,4 @@
-From e29b134e142cd759c85de4ea7c26084e87380ce1 Mon Sep 17 00:00:00 2001
+From 357f02c963478c4994ba5038accadce1576601d5 Mon Sep 17 00:00:00 2001
 From: Stacey Sheldon <stac@solidgoldbomb.org>
 Date: Thu, 2 Feb 2012 22:42:26 -0500
 Subject: [PATCH 2/2] rtos: add stm32_stlink to FreeRTOS targets
@@ -8,10 +8,10 @@ Subject: [PATCH 2/2] rtos: add stm32_stlink to FreeRTOS targets
  1 files changed, 12 insertions(+), 0 deletions(-)
 
 diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
-index c7b4643..e99d471 100644
+index a646269..8e99c26 100644
 --- a/src/rtos/FreeRTOS.c
 +++ b/src/rtos/FreeRTOS.c
-@@ -57,6 +57,18 @@ const struct FreeRTOS_params FreeRTOS_params_list[] = {
+@@ -59,6 +59,18 @@ const struct FreeRTOS_params FreeRTOS_params_list[] = {
  	0,						/* thread_stack_offset; */
  	52,						/* thread_name_offset; */
  	&rtos_standard_Cortex_M3_stacking,	/* stacking_info */
@@ -31,5 +31,5 @@ index c7b4643..e99d471 100644
  };
  
 -- 
-1.7.1
+1.7.5.4