diff --git a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
index 14b1c7feb3..285d29eeba 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
+++ b/c/src/lib/libbsp/powerpc/mvme3100/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-20	Till Straumann <strauman@slac.stanford.edu>
+
+	* include/bsp.h, startup/bspstart.c: confdefs.h now wants
+	us to use BSP_INTERRUPT_STACK_SIZE instead of
+	CONFIGURE_INTERRUPT_STACK_MEMORY.
+
 2007-03-05	Till Straumann <strauman@slac.stanford.edu>
 
 	* start/start.S, startup/bspstart.c: disable memory-select
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
index ebf25e375a..5a0963dd52 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/mvme3100/include/bsp.h
@@ -28,8 +28,8 @@
  *   - Interrupt stack space is not minimum if defined.
  */
 #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2
-
-#define CONFIGURE_INTERRUPT_STACK_MEMORY  (16 * 1024)
+ 
+#define BSP_INTERRUPT_STACK_SIZE          (16 * 1024)
 
 /*
  * diagram illustrating the role of the configuration
diff --git a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
index 9451062680..561ecb61c5 100644
--- a/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
+++ b/c/src/lib/libbsp/powerpc/mvme3100/startup/bspstart.c
@@ -452,10 +452,6 @@ VpdBufRec          vpdData [] = {
 	 * they can use atexit()
 	 */
 
-#if 0
-	Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY;
-/* FIXME */
-#endif
 	bsp_clicks_per_usec            = BSP_bus_frequency/(BSP_time_base_divisor * 1000);
 
 #ifdef SHOW_MORE_INIT_SETTINGS