diff --git a/include/libopencm3/stm32/g4/timer.h b/include/libopencm3/stm32/g4/timer.h
new file mode 100644
index 00000000..06a661c7
--- /dev/null
+++ b/include/libopencm3/stm32/g4/timer.h
@@ -0,0 +1,35 @@
+/** @defgroup timer_defines Timer Defines
+ *
+ * @brief <b>Defined Constants and Types for the STM32G4xx Timers</b>
+ *
+ * @ingroup STM32G4xx_defines
+ *
+ * @version 1.0.0
+ *
+ * @date 10 Jul 2020
+ *
+ * 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_TIMER_H
+#define LIBOPENCM3_TIMER_H
+
+#include <libopencm3/stm32/common/timer_common_f24.h>
+
+#endif
diff --git a/include/libopencm3/stm32/timer.h b/include/libopencm3/stm32/timer.h
index 32ddd157..a1d10a5c 100644
--- a/include/libopencm3/stm32/timer.h
+++ b/include/libopencm3/stm32/timer.h
@@ -42,6 +42,8 @@
 #       include <libopencm3/stm32/l4/timer.h>
 #elif defined(STM32G0)
 #       include <libopencm3/stm32/g0/timer.h>
+#elif defined(STM32G4)
+#       include <libopencm3/stm32/g4/timer.h>
 #elif defined(STM32H7)
 #       include <libopencm3/stm32/h7/timer.h>
 #else
diff --git a/lib/stm32/g4/Makefile b/lib/stm32/g4/Makefile
index 019951ba..6fbaebb2 100644
--- a/lib/stm32/g4/Makefile
+++ b/lib/stm32/g4/Makefile
@@ -39,6 +39,7 @@ OBJS += flash.o flash_common_all.o flash_common_f.o flash_common_idcache.o
 OBJS += gpio_common_all.o gpio_common_f0234.o
 OBJS += pwr.o
 OBJS += rcc.o rcc_common_all.o
+OBJS += timer_common_all.o timer_common_f0234.o
 
 VPATH += ../../usb:../:../../cm3:../common
 VPATH += ../../ethernet