diff --git a/leanpkg/leanpkg/main.lean b/leanpkg/leanpkg/main.lean
index fda8497cf5..e0d982a6ac 100644
--- a/leanpkg/leanpkg/main.lean
+++ b/leanpkg/leanpkg/main.lean
@@ -115,8 +115,8 @@ def main : ∀ (args : list string), io unit
       version := "1",
       dependencies := []
     } user_toml_fn,
-  -- TODO(gabriel): remove this awesomely disgusting hack
-  exec_cmd "bash" $ ["-c", "cd $1 && shift && leanpkg add \"$@\" && leanpkg configure", "_", dot_lean_dir] ++ rest
+  exec_cmd "leanpkg" ("add" :: rest) dot_lean_dir,
+  exec_cmd "leanpkg" ["configure"] dot_lean_dir
 | ["dump"] := read_desc >>= io.print_ln
 | _ := io.fail usage
 
diff --git a/leanpkg/leanpkg/proc.lean b/leanpkg/leanpkg/proc.lean
index c4dc4d42fd..85c13cd1c8 100644
--- a/leanpkg/leanpkg/proc.lean
+++ b/leanpkg/leanpkg/proc.lean
@@ -13,7 +13,7 @@ def exec_cmd (cmd : string) (args : list string) (cwd : option string := none) :
 let cmdstr := join " " (cmd::args),
 io.put_str_ln $ "> " ++
   match cwd with
-  | some cwd := "(cd " ++ cwd ++ "; " ++ cmdstr ++ ")"
+  | some cwd := cmdstr ++ "    # in directory " ++ cwd
   | none := cmdstr
   end,
 ch ← spawn { cmd := cmd, args := args, cwd := cwd },