diff --git a/Distribution/Simple/Configure.hs b/Distribution/Simple/Configure.hs
index 782048d00a9..7b2be816fcf 100644
--- a/Distribution/Simple/Configure.hs
+++ b/Distribution/Simple/Configure.hs
@@ -351,7 +351,7 @@ findCompiler verbose flavor = do
 compilerPkgToolName :: CompilerFlavor -> String
 compilerPkgToolName GHC  = "ghc-pkg"
 compilerPkgToolName NHC  = "hmake" -- FIX: nhc98-pkg Does not yet exist
-compilerPkgToolName Hugs = "hugs" -- FIX (HUGS): hugs-pkg does not yet exist
+compilerPkgToolName Hugs = "hugs"
 compilerPkgToolName cmp  = error $ "Unsupported compiler: " ++ (show cmp)
 
 configCompilerVersion :: CompilerFlavor -> FilePath -> Int -> IO Version
diff --git a/Distribution/Simple/Install.hs b/Distribution/Simple/Install.hs
index cd0b22c95aa..1718efd3f25 100644
--- a/Distribution/Simple/Install.hs
+++ b/Distribution/Simple/Install.hs
@@ -207,6 +207,7 @@ installHugs verbose libDir installProgDir binDir targetProgDir buildPref pkg_des
             ("Main" : autogenModuleName pkg_descr : otherModules (buildInfo exe)) hugsInstallSuffixes True False
         let targetName = "\"" ++ (targetDir `joinFileName` hugsMainFilename exe) ++ "\""
         -- FIX (HUGS): use extensions, and options from file too?
+        -- see http://hackage.haskell.org/trac/hackage/ticket/43
         let hugsOptions = hcOptions Hugs (options (buildInfo exe))
 #if mingw32_HOST_OS || mingw32_TARGET_OS
         let exeFile = binDir `joinFileName` exeName exe `joinFileExt` "bat"
diff --git a/Distribution/Simple/Register.hs b/Distribution/Simple/Register.hs
index fd2564cb7bf..5887da487e3 100644
--- a/Distribution/Simple/Register.hs
+++ b/Distribution/Simple/Register.hs
@@ -177,7 +177,6 @@ register pkg_descr lbi (userInst, genScript, verbose)
                            pkgTool allFlags
          else rawSystemExit verbose pkgTool allFlags
 
-      -- FIX (HUGS):
       Hugs -> do
 	createDirectoryIfMissing True (hugsPackageDir pkg_descr lbi)
 	copyFileVerbose verbose installedPkgConfigFile