diff --git a/CHANGELOG.md b/CHANGELOG.md
index 78db6786..5848c670 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Changed
 
+- move interrupt generation after generic file
+
 - [breaking-change] make `write_with_zero` method `unsafe` because the way it is
 
 - [breaking-change] remove `Variant<U, ENUM_A>`, use `Option<ENUM_A>` instead
diff --git a/src/generate/device.rs b/src/generate/device.rs
index dce87bd4..dc112ce2 100644
--- a/src/generate/device.rs
+++ b/src/generate/device.rs
@@ -94,8 +94,6 @@ pub fn render(
         fpu_present = cpu.fpu_present;
     }
 
-    out.extend(interrupt::render(target, &d.peripherals, device_x)?);
-
     let core_peripherals: &[_] = if fpu_present {
         &[
             "CBP", "CPUID", "DCB", "DWT", "FPB", "FPU", "ITM", "MPU", "NVIC", "SCB", "SYST", "TPIU",
@@ -166,6 +164,8 @@ pub fn render(
         });
     }
 
+    out.extend(interrupt::render(target, &d.peripherals, device_x)?);
+
     for p in &d.peripherals {
         if target == Target::CortexM && core_peripherals.contains(&&*p.name.to_uppercase()) {
             // Core peripherals are handled above