diff --git a/hstar.cabal b/hstar.cabal
--- a/hstar.cabal
+++ b/hstar.cabal
@@ -1,6 +1,6 @@
 cabal-version: 2.0
 name:          hstar
-version:       0.1.0.0
+version:       0.1.0.1
 license:       BSD3
 license-file:  LICENSE
 copyright:     Copyright: (c) 2019-2020 Vanessa McHale
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -30,10 +30,11 @@
 unpack = Unpack
     <$> argument str
         (metavar "SRC"
-        -- <> completer (bashCompleter "file -X '!*.*tar' -o plusdirs")
+        <> fileCompletions
         <> help "Archive to unpack")
     <*> optional (argument str
         (metavar "DEST"
+        <> dirCompletions
         <> help "Where to unpack it"))
 
 packDir :: Parser Command
@@ -49,11 +50,13 @@
 dir :: Parser FilePath
 dir = argument str
         (metavar "DIR"
+        <> dirCompletions
         <> help "Directory to pack up")
 
 archive :: Parser FilePath
 archive = argument str
         (metavar "ARCHIVE"
+        <> fileCompletions
         <> help "File to pack it to")
 
 pack :: Parser Command
@@ -62,8 +65,15 @@
         (metavar "FILE"
         <> long "file"
         <> short 'f'
+        <> fileCompletions
         <> help "File to add to archive"))
     <*> archive
+
+fileCompletions :: HasCompleter f => Mod f a
+fileCompletions = completer (bashCompleter "file -o plusdirs")
+
+dirCompletions :: HasCompleter f => Mod f a
+dirCompletions = completer (bashCompleter "directory")
 
 cmd :: Parser Command
 cmd = hsubparser