diff --git a/CHANGELOG b/CHANGELOG
index 1325ffeb5e8e8279cff33119954114eefa0f361f..a8db4a8c7d44bd8075cc2af200e11a48771f6dae 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes for U-Boot 1.1.3:
 ======================================================================
 
+* measure_gclk() is needed when DEBUG is enabled
+  Patch by Bryan O'Donoghue, 25 Apr 2005
+
 * Add UPD-Checksum code, fix problem in net.c (return instead of break)
   Patch by Reinhard Arlt, 12 Aug 2005
 
diff --git a/cpu/mpc8xx/speed.c b/cpu/mpc8xx/speed.c
index 95003ed9c114e0c39045f83220554c3b0718ea7c..f03831617c1f24e316e49e182498e9c0c466e0ec 100644
--- a/cpu/mpc8xx/speed.c
+++ b/cpu/mpc8xx/speed.c
@@ -25,7 +25,7 @@
 #include <mpc8xx.h>
 #include <asm/processor.h>
 
-#if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK)
+#if !defined(CONFIG_8xx_CPUCLK_DEFAULT) || defined(CFG_MEASURE_CPUCLK) || defined(DEBUG)
 
 #define PITC_SHIFT 16
 #define PITR_SHIFT 16