diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+haskell-module-management (0.17.2) unstable; urgency=low
+
+  * Changes from Adam Vogt for cabal-1.18, nicer path completion.
+
+ -- David Fox <dsf@seereason.com>  Fri, 13 Sep 2013 11:30:43 -0700
+
 haskell-module-management (0.17.1) unstable; urgency=low
 
   * Restore the -O0 option to the build of hmm.
diff --git a/module-management.cabal b/module-management.cabal
--- a/module-management.cabal
+++ b/module-management.cabal
@@ -1,5 +1,5 @@
 Name:               module-management
-Version:            0.17.1
+Version:            0.17.2
 Synopsis:           Clean up module imports, split and merge modules
 Description:        Clean up module imports, split and merge modules.
 Homepage:           http://src.seereason.com/module-management
diff --git a/scripts/CLI.hs b/scripts/CLI.hs
--- a/scripts/CLI.hs
+++ b/scripts/CLI.hs
@@ -91,7 +91,7 @@
 main :: IO ()
 main = do
     conf <- cmdArgs defaultHMM
-    args <- mapM canonicalizePath (otherFiles conf)
+    let args = otherFiles conf
 
     pkgDesc' <-
         traverse (Cabal.readPackageDescription (toEnumBounded (verbosityCabal conf)))
diff --git a/scripts/CLI/Cabal/Instances.hs b/scripts/CLI/Cabal/Instances.hs
--- a/scripts/CLI/Cabal/Instances.hs
+++ b/scripts/CLI/Cabal/Instances.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE DeriveDataTypeable #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE TypeFamilies #-}
@@ -54,6 +55,10 @@
 
 deriving instance (Generic a, Generic b, Generic c) => Generic (CondTree a b c)
 
+#if MIN_VERSION_Cabal(1,18,0)
+-- cabal 1.18 has these instances. There should be
+-- a way to derive instance-if-doesn't-exist-already
+#else
 deriving instance Typeable3 CondTree
 deriving instance Typeable1 Condition
 
@@ -88,6 +93,9 @@
 deriving instance Typeable VersionRange
 
 deriving instance Typeable ModuleName
+#endif
+
+
 instance Generic ModuleName where
     type Rep ModuleName = Rep [String]
     from = from . components
diff --git a/testdata.tar.gz b/testdata.tar.gz
Binary files a/testdata.tar.gz and b/testdata.tar.gz differ