diff --git a/Main.hs b/Main.hs
--- a/Main.hs
+++ b/Main.hs
@@ -32,8 +32,7 @@
 import qualified Git.CmdLine as Cli
 #endif
 import           Options.Applicative
-import           Prelude hiding (FilePath, null)
-import           Shelly
+import           Shelly hiding (FilePath)
 
 #if USE_LIBGIT2
 factory :: RepositoryFactory Lg.LgRepository IO Lg.Repository
@@ -57,8 +56,6 @@
 fromStrict = TL.fromStrict
 #endif
 
-instance Read FilePath
-
 data Options = Options
     { verbose    :: Bool
     , dryRun     :: Bool
@@ -95,7 +92,7 @@
 
 pushToGitHub :: Options -> IO ()
 pushToGitHub opts = do
-    gd <- fromText . TL.init <$> sh opts (run "git" ["rev-parse", "--git-dir"])
+    gd <- TL.unpack . TL.init <$> sh opts (run "git" ["rev-parse", "--git-dir"])
 
     remoteName <- case remote opts of
         Nothing -> sh opts $ getRemoteName gd
diff --git a/git-gpush.cabal b/git-gpush.cabal
--- a/git-gpush.cabal
+++ b/git-gpush.cabal
@@ -1,5 +1,5 @@
 Name:    git-gpush
-Version: 2.0.1.0
+Version: 2.1.0.0
 
 Synopsis:    More intelligent push-to-GitHub utility.
 Description: More intelligent push-to-GitHub utility.
@@ -21,17 +21,17 @@
     ghc-options: -Wall
 
     Build-depends: base                 >= 4 && < 5
+                 , gitlib               >= 2.1.0.0
+                 , gitlib-cmdline       >= 2.1.0.0
+                 -- , gitlib-libgit2       >= 2.1.0.0
                  , bytestring           >= 0.9.2.1
                  , containers           >= 0.4.2.1
-                 , gitlib               >= 2.0.0.0
-                 , gitlib-cmdline       >= 2.0.1.0
-                 -- , gitlib-libgit2       >= 2.0.0.0
+                 , directory            >= 1.1.0.2
+                 , filepath             >= 1.3.0.0
                  , hslogger             >= 1.2
                  , old-locale           >= 1.0.0.4
                  , optparse-applicative >= 0.5.2.1
                  , shelly               >= 0.14
-                 , system-fileio        >= 0.3.11
-                 , system-filepath      >= 0.4.7
                  , tagged               >= 0.4.5
                  , text                 >= 0.11.2
                  , time                 >= 1.4