diff --git a/include/libopencm3/stm32/f3/iwdg.h b/include/libopencm3/stm32/f3/iwdg.h
new file mode 100644
index 00000000..24423b76
--- /dev/null
+++ b/include/libopencm3/stm32/f3/iwdg.h
@@ -0,0 +1,54 @@
+/** @defgroup iwdg_defines IWDG Defines
+
+@brief <b>Defined Constants and Types for the STM32F3xx Independent Watchdog
+Timer</b>
+
+@ingroup STM32F3xx_defines
+
+@version 1.0.0
+
+@date 18 August 2012
+
+LGPL License Terms @ref lgpl_license
+ */
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * Copyright (C) 2010 Thomas Otto <tommi@viadmin.org>
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef LIBOPENCM3_IWDG_H
+#define LIBOPENCM3_IWDG_H
+
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32/common/iwdg_common_all.h>
+
+/* --- IWDG registers ------------------------------------------------------ */
+
+/* Window register (IWDG_WINR) */
+#define IWDG_WINR                               MMIO32(IWDG_BASE + 0x10)
+
+/* --- IWDG_SR values ------------------------------------------------------ */
+
+/* WVU: Watchdog counter window value update */
+#define IWGD_SR_WVU                     (1 << 2)
+
+/* --- IWDG_WIN values ----------------------------------------------------- */
+
+/* Bits 11:0 WIN[11:0]: Watchdog counter window value */
+
+#endif
+
diff --git a/include/libopencm3/stm32/iwdg.h b/include/libopencm3/stm32/iwdg.h
index 60bbd9e2..dcd1a6c7 100644
--- a/include/libopencm3/stm32/iwdg.h
+++ b/include/libopencm3/stm32/iwdg.h
@@ -21,6 +21,8 @@
 #       include <libopencm3/stm32/f1/iwdg.h>
 #elif defined(STM32F2)
 #       include <libopencm3/stm32/f2/iwdg.h>
+#elif defined(STM32F3)
+#       include <libopencm3/stm32/f3/iwdg.h>
 #elif defined(STM32F4)
 #       include <libopencm3/stm32/f4/iwdg.h>
 #elif defined(STM32L1)
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index 924cfa88..d37ada17 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -37,7 +37,8 @@ ARFLAGS		= rcs
 OBJS		= rcc.o gpio.o flash.o adc.o exti2.o
 
 OBJS            += gpio_common_all.o gpio_common_f234.o i2c_common_all.o\
-		   dac_common_all.o usart_common_all.o crc_common_all.o
+		   dac_common_all.o usart_common_all.o crc_common_all.o\
+		   iwdg_common_all.o
 
 
 VPATH += ../../usb:../:../../cm3:../common
diff --git a/lib/stm32/f3/iwdg.c b/lib/stm32/f3/iwdg.c
new file mode 100644
index 00000000..1cead19f
--- /dev/null
+++ b/lib/stm32/f3/iwdg.c
@@ -0,0 +1,33 @@
+/** @defgroup iwdg_file IWDG
+
+@ingroup STM32F3xx
+
+@brief <b>libopencm3 STM32F3xx Independent Watchdog Timer</b>
+
+@version 1.0.0
+
+@date 18 August 2012
+
+LGPL License Terms @ref lgpl_license
+*/
+
+/*
+ * This file is part of the libopencm3 project.
+ *
+ * This library is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <libopencm3/stm32/iwdg.h>
+#include <libopencm3/stm32/common/iwdg_common_all.h>
+