diff --git a/cabal-debian.cabal b/cabal-debian.cabal
--- a/cabal-debian.cabal
+++ b/cabal-debian.cabal
@@ -1,5 +1,5 @@
 Name:           cabal-debian
-Version:        4.35.5
+Version:        4.35.6
 Copyright:      Copyright (c) 2007-2014, David Fox, Jeremy Shaw
 License:        BSD3
 License-File:   LICENSE
diff --git a/changelog b/changelog
--- a/changelog
+++ b/changelog
@@ -1,3 +1,9 @@
+haskell-cabal-debian (4.35.6) unstable; urgency=low
+
+  * Restore ghc-7.6.3 support
+
+ -- David Fox <dsf@seereason.com>  Wed, 30 Nov 2016 05:57:29 -0800
+
 haskell-cabal-debian (4.35.5) unstable; urgency=low
 
   * Fix up some ghcjs and hvr packaging issues.
diff --git a/src/Debian/Debianize/Bundled.hs b/src/Debian/Debianize/Bundled.hs
--- a/src/Debian/Debianize/Bundled.hs
+++ b/src/Debian/Debianize/Bundled.hs
@@ -55,8 +55,10 @@
 #else
 import Data.Monoid (mempty)
 
+#if !MIN_VERSION_Cabal(1,22,0)
 unPackageName :: PackageName -> String
 unPackageName (PackageName s) = s
+#endif
 
 makeVersion :: [Int] -> Version
 makeVersion ns = Version ns []
diff --git a/src/Debian/GHC.hs b/src/Debian/GHC.hs
--- a/src/Debian/GHC.hs
+++ b/src/Debian/GHC.hs
@@ -42,12 +42,13 @@
 #endif
 import System.Console.GetOpt (ArgDescr(ReqArg), OptDescr(..))
 import System.Directory (doesDirectoryExist)
-import System.Environment (getEnv, setEnv)
+import System.Environment (getEnv)
 import System.Exit (ExitCode(ExitFailure, ExitSuccess))
 -- import System.IO (hPutStrLn, stderr)
 import System.IO.Error (isDoesNotExistError)
 import System.IO.Unsafe (unsafePerformIO)
 import System.Process (readProcess, showCommandForUser, readProcessWithExitCode)
+import System.Posix.Env (setEnv)
 import System.Unix.Chroot (useEnv, fchroot)
 import System.Unix.Mount (WithProcAndSys)
 import Text.ParserCombinators.ReadP (readP_to_S)
@@ -117,12 +118,12 @@
 withModifiedPATH :: MonadIO m => (String -> String) -> m a -> m a
 withModifiedPATH f action = do
   path0 <- liftIO $ getEnv "PATH"
-  liftIO $ setEnv "PATH" (f path0)
+  liftIO $ setEnv "PATH" (f path0) True
   -- liftIO $ hPutStrLn stderr $ "*** withCompilerPath vendor=" ++ show vendor
   -- liftIO $ hPutStrLn stderr $ "*** Setting $PATH to " ++ show path
   r <- action
   -- liftIO $ hPutStrLn stderr $ "*** Resetting $PATH to " ++ show path0
-  liftIO $ setEnv "PATH" path0
+  liftIO $ setEnv "PATH" path0 True
   return r
 
 -- | Memoized version of newestAvailable'
@@ -237,8 +238,10 @@
             -- Debian puts the .haddock files in ghc-doc
             (GHC, Documentation, True) -> BinPkgName (hcname ++ "-doc")
             -- In HVR repo the .haddock files required to buid html
-            -- are in the main compiler package
-            (GHC, Documentation, False) -> BinPkgName hcname
+            -- are in the main compiler package.  However, the html
+            -- files in ghc-<version>-htmldocs are also needed to
+            -- create links.
+            (GHC, Documentation, False) -> BinPkgName (hcname ++ "-htmldocs")
             (GHC, Profiling, _) -> BinPkgName (hcname ++ "-prof")
             _ -> BinPkgName hcname