diff --git a/Cabal.cabal b/Cabal.cabal
--- a/Cabal.cabal
+++ b/Cabal.cabal
@@ -1,5 +1,5 @@
 Name: Cabal
-Version: 1.4.0.0
+Version: 1.4.0.1
 Copyright: 2003-2006, Isaac Jones
            2005-2008, Duncan Coutts
 License: BSD3
@@ -44,7 +44,7 @@
   Build-Depends: filepath >= 1 && < 1.2
 
   GHC-Options: -Wall
-  CPP-Options: "-DCABAL_VERSION=1,4,0,0"
+  CPP-Options: "-DCABAL_VERSION=1,4,0,1"
   nhc98-Options: -K4M
 
   Exposed-Modules:
diff --git a/Distribution/PackageDescription.hs b/Distribution/PackageDescription.hs
--- a/Distribution/PackageDescription.hs
+++ b/Distribution/PackageDescription.hs
@@ -120,7 +120,7 @@
 import Distribution.Text
          ( Text(..), display, simpleParse )
 import Distribution.Simple.Utils
-         ( currentDir, notice, die, dieWithLocation, warn, intercalate
+         ( notice, die, dieWithLocation, warn, intercalate
          , lowercase, cabalVersion, readUTF8File, writeUTF8File )
 import Language.Haskell.Extension (Extension)
 import Distribution.Verbosity (Verbosity)
@@ -388,7 +388,7 @@
                      }
 
 emptyBuildInfo :: BuildInfo
-emptyBuildInfo = nullBuildInfo { hsSourceDirs = [currentDir] }
+emptyBuildInfo = nullBuildInfo
 
 -- | The 'BuildInfo' for the library (if there is one and it's buildable) and
 -- all the buildable executables. Useful for gathering dependencies.
diff --git a/Distribution/Simple/Haddock.hs b/Distribution/Simple/Haddock.hs
--- a/Distribution/Simple/Haddock.hs
+++ b/Distribution/Simple/Haddock.hs
@@ -140,8 +140,9 @@
     let have_src_hyperlink_flags = version >= Version [0,8] []
         isVersion2               = version >= Version [2,0] []
 
-    when (hoogle && isVersion2) $
-      die $ "haddock 2.x does not support the --hoogle flag."
+    when (hoogle && version > Version [2] []
+                 && version < Version [2,2] []) $
+      die $ "haddock 2.0 and 2.1 do not support the --hoogle flag."
 
     let mockFlags
           | isVersion2 = []
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -2,6 +2,10 @@
 
 1.5.x (current development version)
 
+1.4.0.1 Duncan Coutts <duncan@haskell.org> June 2008
+	* Fix a bug which caused '.' to always be in the sources search path
+	* Haddock-2.2 and later do now support the --hoogle flag
+
 1.4.0.0 Duncan Coutts <duncan@haskell.org> June 2008
 	* Rewritten command line handling support
 	* Command line completion with bash