diff --git a/mk/config.mk.in b/mk/config.mk.in
index a906d25fdf6f545e5509469649204c947d8c66c4..f8d4d6a95f67358eda5851ececade537dc27623d 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -360,9 +360,11 @@ LAX_DEPENDENCIES = NO
 # ----------------------------------------------------------------------------
 # Options for GHC's RTS
 
-# For an optimised RTS (you probably don't want to change these; we build
-# a debugging RTS by default now.  Use -debug to get it).
-GhcRtsHcOpts=-optc-O2
+# Build an optimised RTS.  Remember that we need to turn on
+# optimisation both for C code (-optc-O2) and .cmm code (-O2).  For
+# the debugging RTS flavour, rts/ghc.mk overrides these to turn off
+# optimisation.
+GhcRtsHcOpts=-optc-O2 -O2
 GhcRtsCcOpts=-fomit-frame-pointer
 
 # Include the front panel code?  Needs GTK+.