diff --git a/Distribution/PreProcess.hs b/Distribution/PreProcess.hs
index e0bbe6693057e0eaa7b41989e79d935ebd3b0315..847793ead01f6801d1b296af036bb9e933054b80 100644
--- a/Distribution/PreProcess.hs
+++ b/Distribution/PreProcess.hs
@@ -250,6 +250,8 @@ hcDefines Compiler { compilerFlavor=NHC, compilerVersion=version }
   = ["-D__NHC__=" ++ versionInt version]
 hcDefines Compiler { compilerFlavor=Hugs }
   = ["-D__HUGS__"]
+hcDefines Compiler { compilerFlavor=GHC, compilerVersion=version }
+  = ["-D__GLASGOW_HASKELL__=" ++ versionInt version]
 hcDefines _ = []
 
 versionInt :: Version -> String
diff --git a/TODO b/TODO
index 21c680798d8b1729ac43ff3f8142a46cb377bc31..544f8d7ee1075b035a78b857ca0ef352c8b43bb9 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,8 @@ let me know if you want a complete testcase.
 * Clarify build-depends; unix? posix? utils? see journal entry of aug
    22, 2005.
 
+* look at "cabal design 
+
 * REMOVE THESE FLAGS: add flags The patch adds a couple extra configure options,
   --enable-library-for-ghci / --disable-library-for-ghci or whatever
    they end up being, to the manual.  Which is default?  Add test case