diff --git a/make/ChangeLog b/make/ChangeLog
index 14a666a9b6..69e8dadbcd 100644
--- a/make/ChangeLog
+++ b/make/ChangeLog
@@ -1,5 +1,6 @@
 2007-01-18	Ralf Corsépius <ralf.corsepius@rtems.org>
 
+	* custom/h8sim.cfg: CFLAGS_OPTIMIZE_V = -O2.
 	* custom/score603e.cfg: CFLAGS_OPTIMIZE_V = -O2.
 	Remove DRIVER_ARCHITECTURE.
 	* custom/csb336.cfg, custom/edb7312.cfg, custom/gba.cfg:
diff --git a/make/custom/h8sim.cfg b/make/custom/h8sim.cfg
index 080836885f..cac9e40819 100644
--- a/make/custom/h8sim.cfg
+++ b/make/custom/h8sim.cfg
@@ -18,8 +18,7 @@ RTEMS_BSP_FAMILY=h8sim
 CPU_CFLAGS=-mh -mint32
 
 # optimize flag: typically -O2
-# CFLAGS_OPTIMIZE_V = -O4 -mleaf-procedures
-CFLAGS_OPTIMIZE_V = -O0
+CFLAGS_OPTIMIZE_V = -O2
 
 # The following are definitions of make-exe which will work using ld as
 # is currently required.  It is expected that as of gcc 2.8, the end user