diff --git a/include/libopencm3/stm32/common/spi_common_all.h b/include/libopencm3/stm32/common/spi_common_all.h
index 5033e818..7248b256 100644
--- a/include/libopencm3/stm32/common/spi_common_all.h
+++ b/include/libopencm3/stm32/common/spi_common_all.h
@@ -135,11 +135,22 @@ specific memorymap.h header before including this header file.*/
 @ingroup spi_defines
 
 @{*/
+#if defined(STM32F3)
+
+#define SPI_CR1_CRCL_8BIT		(0 << 11)
+#define SPI_CR1_CRCL_16BIT		(1 << 11)
+/**@}*/
+#define SPI_CR1_CRCL			(1 << 11)
+
+#elif !defined(STM32F3)
+
 #define SPI_CR1_DFF_8BIT		(0 << 11)
 #define SPI_CR1_DFF_16BIT		(1 << 11)
 /**@}*/
 #define SPI_CR1_DFF			(1 << 11)
 
+#endif
+
 /* RXONLY: Receive only */
 #define SPI_CR1_RXONLY			(1 << 10)
 
@@ -221,6 +232,39 @@ specific memorymap.h header before including this header file.*/
 
 /* Bits [15:8]: Reserved. Forced to 0 by hardware. */
 
+#if defined(STM32F3)
+
+/* LDMA_TX: Last DMA transfer for transmission */
+#define SPI_CR2_LDMA_TX			(1 << 14)
+
+/* LDMA_RX: Last DMA transfer for reception */
+#define SPI_CR2_LDMA_RX			(1 << 13)
+
+/* FRXTH: FIFO reception threshold */
+#define SPI_CR2_FRXTH			(1 << 12)
+
+/* DS [3:0]: Data size */
+// 0x0 - 0x2 NOT USED
+#define SPI_CR2_DS_4BIT			(0x3 << 8)
+#define SPI_CR2_DS_5BIT			(0x4 << 8)
+#define SPI_CR2_DS_6BIT			(0x5 << 8)
+#define SPI_CR2_DS_7BIT			(0x6 << 8)
+#define SPI_CR2_DS_8BIT			(0x7 << 8)
+#define SPI_CR2_DS_9BIT			(0x8 << 8)
+#define SPI_CR2_DS_10BIT		(0x9 << 8)
+#define SPI_CR2_DS_11BIT		(0xA << 8)
+#define SPI_CR2_DS_12BIT		(0xB << 8)
+#define SPI_CR2_DS_13BIT		(0xC << 8)
+#define SPI_CR2_DS_14BIT		(0xD << 8)
+#define SPI_CR2_DS_15BIT		(0xE << 8)
+#define SPI_CR2_DS_16BIT		(0xF << 8)
+
+
+/* NSSP: NSS pulse management */
+#define SPI_CR2_NSSP			(1 << 3)
+
+#endif
+
 /* TXEIE: Tx buffer empty interrupt enable */
 #define SPI_CR2_TXEIE			(1 << 7)
 
@@ -246,6 +290,22 @@ specific memorymap.h header before including this header file.*/
 
 /* Bits [15:8]: Reserved. Forced to 0 by hardware. */
 
+#if defined(STM32F3)
+
+/* FTLVL[1:0]: FIFO Transmission Level */
+#define SPI_SR_FTLVL_FIFO_EMPTY		(0x0 << 11)
+#define SPI_SR_FTLVL_QUARTER_FIFO	(0x1 << 11)
+#define SPI_SR_FTLVL_HALF_FIFO		(0x2 << 11)
+#define SPI_SR_FTLVL_FIFO_FULL		(0x3 << 11)
+
+/* FRLVL[1:0]: FIFO Reception Level */
+#define SPI_SR_FRLVL_FIFO_EMPTY		(0x0 << 9)
+#define SPI_SR_FRLVL_QUARTER_FIFO	(0x1 << 9)
+#define SPI_SR_FRLVL_HALF_FIFO		(0x2 << 9)
+#define SPI_SR_FRLVL_FIFO_FULL		(0x3 << 9)
+
+#endif
+
 /* BSY: Busy flag */
 #define SPI_SR_BSY			(1 << 7)
 
diff --git a/include/libopencm3/stm32/f3/spi.h b/include/libopencm3/stm32/f3/spi.h
new file mode 100644
index 00000000..2581b7e2
--- /dev/null
+++ b/include/libopencm3/stm32/f3/spi.h
@@ -0,0 +1,38 @@
+/** @defgroup spi_defines SPI Defines
+
+@brief <b>Defined Constants and Types for the STM32F3xx SPI</b>
+
+@ingroup STM32F3xx_defines
+
+@version 1.0.0
+
+@date 5 December 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/>.
+ */
+
+#ifndef LIBOPENCM3_SPI_H
+#define LIBOPENCM3_SPI_H
+
+#include <libopencm3/stm32/memorymap.h>
+#include <libopencm3/stm32/common/spi_common_f24.h>
+
+#endif
+
diff --git a/include/libopencm3/stm32/spi.h b/include/libopencm3/stm32/spi.h
index 28aadd1a..f7df21e1 100644
--- a/include/libopencm3/stm32/spi.h
+++ b/include/libopencm3/stm32/spi.h
@@ -21,6 +21,8 @@
 #       include <libopencm3/stm32/f1/spi.h>
 #elif defined(STM32F2)
 #       include <libopencm3/stm32/f2/spi.h>
+#elif defined(STM32F3)
+#       include <libopencm3/stm32/f3/spi.h>
 #elif defined(STM32F4)
 #       include <libopencm3/stm32/f4/spi.h>
 #elif defined(STM32L1)
diff --git a/lib/stm32/common/spi_common_all.c b/lib/stm32/common/spi_common_all.c
index b8567485..466473df 100644
--- a/lib/stm32/common/spi_common_all.c
+++ b/lib/stm32/common/spi_common_all.c
@@ -394,6 +394,8 @@ void spi_set_next_tx_from_crc(uint32_t spi)
 	SPI_CR1(spi) |= SPI_CR1_CRCNEXT;
 }
 
+#if !defined(STM32F3)
+
 /*---------------------------------------------------------------------------*/
 /** @brief SPI Set Data Frame Format to 8 bits
 
@@ -416,6 +418,8 @@ void spi_set_dff_16bit(uint32_t spi)
 	SPI_CR1(spi) |= SPI_CR1_DFF;
 }
 
+#endif
+
 /*---------------------------------------------------------------------------*/
 /** @brief SPI Set Full Duplex (3-wire) Mode
 
diff --git a/lib/stm32/f3/Makefile b/lib/stm32/f3/Makefile
index d37ada17..21ffa9a6 100644
--- a/lib/stm32/f3/Makefile
+++ b/lib/stm32/f3/Makefile
@@ -38,7 +38,7 @@ 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\
-		   iwdg_common_all.o
+		   iwdg_common_all.o spi_common_all.o
 
 
 VPATH += ../../usb:../:../../cm3:../common