diff --git a/demos/XMC/RT-XMC1100-XMC_2GO/Makefile b/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
index aee362f1e..50808b6d5 100644
--- a/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
+++ b/demos/XMC/RT-XMC1100-XMC_2GO/Makefile
@@ -24,8 +24,10 @@ ifeq ($(USE_LINK_GC),)
 endif
 
 # Linker extra options here.
+# NOTE: On XMC1100 the following symbols are mapped on the words CLK_VAL1 and
+#       CLK_VAL2.
 ifeq ($(USE_LDOPT),)
-  USE_LDOPT = 
+  USE_LDOPT = --defsym=MemManage_Handler=0xFFFFFFFF,--defsym=BusFault_Handler=0xFFFFFFFF
 endif
 
 # Enable this if you want link time optimizations (LTO)
diff --git a/os/common/startup/ARMCMx/devices/XMC1100/veneers_gcc.S b/os/common/startup/ARMCMx/devices/XMC1100/veneers_gcc.S
index 16640e984..ce1a718ee 100644
--- a/os/common/startup/ARMCMx/devices/XMC1100/veneers_gcc.S
+++ b/os/common/startup/ARMCMx/devices/XMC1100/veneers_gcc.S
@@ -15,7 +15,7 @@
 */
 
 /**
- * @file    veneers_gcc.s
+ * @file    veneers_gcc.S
  * @brief   XMC1100 veneers for GCC.
  *
  * @addtogroup ARMCMx_XMC1100_VENEERS_GCC
@@ -52,10 +52,8 @@ __veneers:
                 mov         pc, r0
                 ldr         r0, =HardFault_Handler
                 mov         pc, r0
-                ldr         r0, =MemManage_Handler
-                mov         pc, r0
-                ldr         r0, =BusFault_Handler
-                mov         pc, r0
+                .long       0
+                .long       0
                 ldr         r0, =UsageFault_Handler
                 mov         pc, r0
                 .long       0