diff --git a/Annex.hs b/Annex.hs
index 58040a2713..3893f61e64 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE PackageImports, GeneralizedNewtypeDeriving, TypeFamilies, MultiParamTypeClasses #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, TypeFamilies, MultiParamTypeClasses #-}
 
 module Annex (
 	Annex,
diff --git a/Assistant/Monad.hs b/Assistant/Monad.hs
index ced98b395a..5a0fc1570e 100644
--- a/Assistant/Monad.hs
+++ b/Assistant/Monad.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE PackageImports, GeneralizedNewtypeDeriving, MultiParamTypeClasses #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving, MultiParamTypeClasses #-}
 
 module Assistant.Monad (
 	Assistant,
diff --git a/Command/Status.hs b/Command/Status.hs
index 37d6500f9a..9192202f5a 100644
--- a/Command/Status.hs
+++ b/Command/Status.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE PackageImports, BangPatterns #-}
+{-# LANGUAGE BangPatterns #-}
 
 module Command.Status where
 
diff --git a/Common.hs b/Common.hs
index 3513425c0a..e8093c43ac 100644
--- a/Common.hs
+++ b/Common.hs
@@ -1,5 +1,3 @@
-{-# LANGUAGE PackageImports #-}
-
 module Common (module X) where
 
 import Control.Monad as X hiding (join)
diff --git a/Utility/Path.hs b/Utility/Path.hs
index d058082df5..8c8fc39e79 100644
--- a/Utility/Path.hs
+++ b/Utility/Path.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE PackageImports #-}
 {- path manipulation
  -
  - Copyright 2010-2011 Joey Hess <joey@kitenet.net>
diff --git a/Utility/State.hs b/Utility/State.hs
index 7f89190823..ad38db542a 100644
--- a/Utility/State.hs
+++ b/Utility/State.hs
@@ -5,8 +5,6 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE PackageImports #-}
-
 module Utility.State where
 
 import "mtl" Control.Monad.State.Strict
diff --git a/git-annex.cabal b/git-annex.cabal
index 263f2f1634..2ebc50168c 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -76,7 +76,7 @@ Executable git-annex
   Include-Dirs: Utility
   C-Sources: Utility/libdiskfree.c Utility/libmounts.c
   CC-Options: -Wall
-  GHC-Options: -threaded -Wall
+  GHC-Options: -threaded -Wall -XPackageImports
   CPP-Options: -DWITH_CLIBS
 
   if flag(Production)