diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 391aae251..1391fc6a5 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24  Paul Brook  <paul@codesourcery.com>
+
+	* arm/redboot-crt0.S: Use cps in Thumb-2 mode.
+
 2006-02-22  Nathan Sidwell  <nathan@codesourcery.com>
 
 	* m68k/Makefile.in (CF_SCRIPTS): New.
diff --git a/libgloss/arm/redboot-crt0.S b/libgloss/arm/redboot-crt0.S
index d059c226e..2499ac091 100644
--- a/libgloss/arm/redboot-crt0.S
+++ b/libgloss/arm/redboot-crt0.S
@@ -33,9 +33,13 @@
 	mov	r7, #0	/* Null frame pointer for Thumb.  */
 
 	/* Enable interrupts for gdb debugging.  */
+#ifdef __thumb2__
+	cpsie if
+#else
 	mrs    r0, cpsr
 	bic    r0, r0, #0xC0
 	msr    cpsr, r0
+#endif
 	
 	mov 	a2, #0			/* Second arg: fill value.  */
 	ldr	a1, .LC1		/* First arg: start of memory block.  */