diff --git a/include/libopencm3/stm32/crc.h b/include/libopencm3/stm32/crc.h
index 54157b1855..51da3b6c6b 100644
--- a/include/libopencm3/stm32/crc.h
+++ b/include/libopencm3/stm32/crc.h
@@ -42,7 +42,8 @@
 #       include <libopencm3/stm32/g0/crc.h>
 #elif defined(STM32G4)
 #       include <libopencm3/stm32/g4/crc.h>
+#elif defined(STM32H7)
+#       include <libopencm3/stm32/h7/crc.h>
 #else
 #       error "stm32 family not defined."
 #endif
-
diff --git a/include/libopencm3/stm32/h7/crc.h b/include/libopencm3/stm32/h7/crc.h
new file mode 100644
index 0000000000..e5951dcbab
--- /dev/null
+++ b/include/libopencm3/stm32/h7/crc.h
@@ -0,0 +1,38 @@
+/** @defgroup crc_defines CRC Defines
+
+@brief <b>libopencm3 Defined Constants and Types for the STM32H7xx CRC
+Generator </b>
+
+@ingroup STM32H7xx_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_CRC_H
+#define LIBOPENCM3_CRC_H
+
+#include <libopencm3/stm32/common/crc_v2.h>
+
+#endif
diff --git a/lib/stm32/h7/Makefile b/lib/stm32/h7/Makefile
index 3b0fedf232..08fe11753a 100644
--- a/lib/stm32/h7/Makefile
+++ b/lib/stm32/h7/Makefile
@@ -37,6 +37,7 @@ TGT_CFLAGS	+= $(STANDARD_FLAGS)
 
 ARFLAGS		= rcs
 
+OBJS += crc_common_all.o crc_v2.o
 OBJS += crs_common_all.o
 OBJS += dac_common_all.o dac_common_v2.o
 OBJS += exti_common_all.o
diff --git a/lib/stm32/h7/meson.build b/lib/stm32/h7/meson.build
index 5f34b7cd92..713b7f7732 100644
--- a/lib/stm32/h7/meson.build
+++ b/lib/stm32/h7/meson.build
@@ -56,6 +56,7 @@ libstm32h7 = static_library(
 	'opencm3_stm32h7',
 	[
 		libstm32h7_sources,
+		libstm32_crc_v2_sources,
 		libstm32_crs_sources,
 		libstm32_dac_v2_sources,
 		libstm32_exti_sources,