diff --git a/mk/config.mk.in b/mk/config.mk.in
index 5f5767e59d5ea075ac33a483b9dd9eba1d1eb805..3b065c38123d6a735348fea4e38385d430e3918a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -87,9 +87,9 @@ IncludeTestDirsInBuild=NO
 # 
 GhcProjectName       =The Glorious Glasgow Haskell Compilation System
 GhcProjectNameShort  =ghc
-GhcProjectVersion    =2.03
+GhcProjectVersion    =2.04
 GhcProjectPatchLevel =0
-GhcBuildeeVersion    =203
+GhcBuildeeVersion    =204
 GhcBuilderVersion    =29
 
 #
@@ -383,6 +383,11 @@ HOSTPLATFORM			= @HostPlatform@
 TARGETPLATFORM			= @TargetPlatform@
 BUILDPLATFORM			= @HostPlatform@
 
+# Hack alert:
+# in one or two places, we need to get at the OS version (major and perhaps even minor),
+# HOSTPLATFORM_GNU is the cpu-manufacturer-os name reported by AC_CANONICAL_SYSTEM.
+#
+HostPlatform_GNU		= @HostPlatformFull@
 HostPlatform_CPP		= @HostPlatform_CPP@
 HostArch_CPP			= @HostArch_CPP@
 HostOS_CPP			= @HostOS_CPP@