diff --git a/src/stm32/jtagtap.c b/src/stm32/jtagtap.c
index ca5576d8..fa924d08 100644
--- a/src/stm32/jtagtap.c
+++ b/src/stm32/jtagtap.c
@@ -37,7 +37,7 @@ int jtagtap_init(void)
 	gpio_port_write(GPIOA, 0x8180);
 	gpio_port_write(GPIOB, 0x0002);
 	
-	gpio_set_mode(JTAG_PORT, GPIO_MODE_OUTPUT_2_MHZ, 
+	gpio_set_mode(JTAG_PORT, GPIO_MODE_OUTPUT_10_MHZ, 
 		GPIO_CNF_OUTPUT_PUSHPULL, TMS_PIN); 
 
 	/* Go to JTAG mode for SWJ-DP */
diff --git a/src/stm32/platform.c b/src/stm32/platform.c
index bdf2b331..44e0f62f 100644
--- a/src/stm32/platform.c
+++ b/src/stm32/platform.c
@@ -67,7 +67,7 @@ platform_init(void)
 
 	gpio_set_mode(JTAG_PORT, GPIO_MODE_OUTPUT_10_MHZ, 
 			GPIO_CNF_OUTPUT_PUSHPULL,
-			TMS_PIN | TCK_PIN | TDO_PIN);
+			TMS_PIN | TCK_PIN | TDI_PIN);
 
 	gpio_set_mode(LED_PORT, GPIO_MODE_OUTPUT_2_MHZ, 
 			GPIO_CNF_OUTPUT_PUSHPULL,