diff --git a/include/libopencm3/stm32/crc.h b/include/libopencm3/stm32/crc.h
index de6f4482..8e97231d 100644
--- a/include/libopencm3/stm32/crc.h
+++ b/include/libopencm3/stm32/crc.h
@@ -32,6 +32,8 @@
 #       include <libopencm3/stm32/f4/crc.h>
 #elif defined(STM32L1)
 #       include <libopencm3/stm32/l1/crc.h>
+#elif defined(STM32L4)
+#       include <libopencm3/stm32/l4/crc.h>
 #else
 #       error "stm32 family not defined."
 #endif
diff --git a/include/libopencm3/stm32/l4/crc.h b/include/libopencm3/stm32/l4/crc.h
new file mode 100644
index 00000000..63c7b95b
--- /dev/null
+++ b/include/libopencm3/stm32/l4/crc.h
@@ -0,0 +1,31 @@
+/** @defgroup crc_defines CRC Defines
+ *
+ * @brief <b>Defined Constants and Types for the STM32L4xx CRC Generator </b>
+ *
+ * @ingroup STM32L4xx_defines
+ *
+ * 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_CRC_H
+#define LIBOPENCM3_CRC_H
+
+#include <libopencm3/stm32/common/crc_v2.h>
+
+#endif
diff --git a/lib/stm32/l4/Makefile b/lib/stm32/l4/Makefile
index 3247068a..54878bf0 100644
--- a/lib/stm32/l4/Makefile
+++ b/lib/stm32/l4/Makefile
@@ -44,6 +44,7 @@ OBJS		= adc.o flash.o pwr.o rcc.o
 OBJS            += rcc_common_all.o
 OBJS            += gpio_common_all.o gpio_common_f0234.o
 OBJS            += adc_common_v2.o adc_common_v2_multi.o
+OBJS            += crc_common_all.o crc_v2.o
 OBJS            += rng_common_v1.o
 OBJS            += timer_common_all.o
 OBJS            += i2c_common_v2.o