diff --git a/misc/completion/ipfs-completion.bash b/misc/completion/ipfs-completion.bash
index 68a18da0b..fd07b09d2 100644
--- a/misc/completion/ipfs-completion.bash
+++ b/misc/completion/ipfs-completion.bash
@@ -10,8 +10,23 @@ _ipfs_help_only()
 
 _ipfs_add()
 {
-    _ipfs_comp "-recursive -quiet -progress -wrap-with-directory \
-            -trickle --help"
+    _ipfs_comp "--recursive --quiet --progress --trickle --only-hash
+            --wrap-with-directory --hidden --help"
+}
+
+_ipfs_bitswap()
+{
+    ipfs_comp "stat wantlist --help"
+}
+
+_ipfs_bitswap_stat()
+{
+    _ipfs_help_only
+}
+
+_ipfs_bitswap_wantlist()
+{
+    ipfs_comp "--peer= --help"
 }
 
 _ipfs_block()
@@ -41,7 +56,7 @@ _ipfs_bootstrap()
 
 _ipfs_bootstrap_add()
 {
-    _ipfs_comp "-default --help"
+    _ipfs_comp "--default --help"
 }
 
 _ipfs_bootstrap_list()
@@ -51,7 +66,7 @@ _ipfs_bootstrap_list()
 
 _ipfs_bootstrap_rm()
 {
-    _ipfs_comp "-all --help"
+    _ipfs_comp "--all --help"
 }
 
 _ipfs_cat()
@@ -67,7 +82,7 @@ _ipfs_commands()
 _ipfs_config()
 {
     # TODO: auto-complete existing config keys
-    _ipfs_comp "edit replace show -bool --help"
+    _ipfs_comp "edit replace show --bool --json --help"
 }
 
 _ipfs_config_edit()
@@ -88,13 +103,14 @@ _ipfs_config_show()
 
 _ipfs_daemon()
 {
-    _ipfs_comp "-init -routing= -mount -writable -mount-ipfs= \
-        -mount-ipns= --help"
+    _ipfs_comp "--init --routing= --mount --writable --mount-ipfs= \
+        --mount-ipns= --unrestricted-api --disable-transport-encryption \
+        --help"
 }
 
 _ipfs_dht()
 {
-    _ipfs_comp "findpeer findprovs query --help"
+    _ipfs_comp "findpeer findprovs get put query --help"
 }
 
 _ipfs_dht_findpeer()
@@ -104,12 +120,22 @@ _ipfs_dht_findpeer()
 
 _ipfs_dht_findprovs()
 {
-    _ipfs_comp "-verbose --help"
+    _ipfs_comp "--verbose --help"
+}
+
+_ipfs_dht_get()
+{
+    _ipfs_comp "--verbose --help"
+}
+
+_ipfs_dht_put()
+{
+    _ipfs_comp "--verbose --help"
 }
 
 _ipfs_dht_query()
 {
-    _ipfs_comp "-verbose --help"
+    _ipfs_comp "--verbose --help"
 }
 
 _ipfs_diag()
@@ -120,22 +146,37 @@ _ipfs_diag()
 _ipfs_diag_net()
 {
     # TODO: auto-complete -vis=*
-    _ipfs_comp "-timeout= -vis= --help"
+    _ipfs_comp "--timeout= --vis= --help"
+}
+
+_ipfs_dns()
+{
+    _ipfs_comp "--recursive --help"
+}
+
+_ipfs_file()
+{
+    _ipfs_comp "ls --help"
+}
+
+_ipfs_file_ls()
+{
+    _ipfs_help_only
 }
 
 _ipfs_get()
 {
-    _ipfs_comp "-output= -archive -compress -compression-level= --help"
+    _ipfs_comp "--output= --archive --compress --compression-level= --help"
 }
 
 _ipfs_id()
 {
-    _ipfs_comp "-format= --help"
+    _ipfs_comp "--format= --help"
 }
 
 _ipfs_init()
 {
-    _ipfs_comp "-bits= -passphrase= -force --help"
+    _ipfs_comp "--bits= --force --help"
 }
 
 _ipfs_log()
@@ -151,12 +192,12 @@ _ipfs_log_level()
 
 _ipfs_log_tail()
 {
-    _ipfs_comp "tail level --help"
+    _ipfs_help_only
 }
 
 _ipfs_ls()
 {
-    _ipfs_help_only
+    _ipfs_comp "--headers --help"
 }
 
 _ipfs_mount()
@@ -176,12 +217,12 @@ _ipfs_name_publish()
 
 _ipfs_name_resolve()
 {
-    _ipfs_help_only
+    _ipfs_comp "--recursive --help"
 }
 
 _ipfs_object()
 {
-    _ipfs_comp "data get links put stat --help"
+    _ipfs_comp "data get links new patch put stat --help"
 }
 
 _ipfs_object_data()
@@ -192,7 +233,7 @@ _ipfs_object_data()
 _ipfs_object_get()
 {
     # TODO: auto-complete encoding
-    _ipfs_comp "--encoding="
+    _ipfs_comp "--encoding= --help"
 }
 
 _ipfs_object_links()
@@ -200,11 +241,21 @@ _ipfs_object_links()
     _ipfs_help_only
 }
 
-_ipfs_object_put()
+_ipfs_object_new()
 {
     _ipfs_help_only
 }
 
+_ipfs_object_patch()
+{
+    _ipfs_help_only
+}
+
+_ipfs_object_put()
+{
+    _ipfs_comp "--inputenc= --help"
+}
+
 _ipfs_object_stat()
 {
     _ipfs_help_only
@@ -217,28 +268,28 @@ _ipfs_pin()
 
 _ipfs_pin_add()
 {
-    _ipfs_comp "-recursive  --help"
+    _ipfs_comp "--recursive  --help"
 }
 
 _ipfs_pin_ls()
 {
     # TODO: auto-complete -type=*
-    _ipfs_comp "-type= --help"
+    _ipfs_comp "--count --quiet --type= --help"
 }
 
 _ipfs_pin_rm()
 {
-    _ipfs_comp "-recursive  --help"
+    _ipfs_comp "--recursive  --help"
 }
 
 _ipfs_ping()
 {
-    _ipfs_comp "-count=  --help"
+    _ipfs_comp "--count=  --help"
 }
 
 _ipfs_refs()
 {
-    _ipfs_comp "local -format= -edges -unique -recursive --help"
+    _ipfs_comp "local --format= --edges --unique --recursive --help"
 }
 
 _ipfs_refs_local()
@@ -253,17 +304,37 @@ _ipfs_repo()
 
 _ipfs_repo_gc()
 {
-    _ipfs_comp "-quiet --help"
+    _ipfs_comp "--quiet --help"
+}
+
+_ipfs_resolve()
+{
+    _ipfs_comp "--recursive --help"
+}
+
+_ipfs_stats()
+{
+    _ipfs_comp "bw --help" 
+}
+
+_ipfs_stats_bw()
+{
+    _ipfs_comp "--peer= --proto= --poll --interval= --help"
 }
 
 _ipfs_swarm()
 {
-    _ipfs_comp "addrs connect disconnect peers --help"
+    _ipfs_comp "addrs connect disconnect filters peers --help"
 }
 
 _ipfs_swarm_addrs()
 {
-    _ipfs_help_only
+    _ipfs_comp "local --help"
+}
+
+_ipfs_swarm_addrs_local()
+{
+    _ipfs_comp "--id --help"
 }
 
 _ipfs_swarm_connect()
@@ -276,6 +347,21 @@ _ipfs_swarm_disconnect()
     _ipfs_help_only
 }
 
+_ipfs_swarm_filters()
+{
+    _ipfs_comp "add rm --help"
+}
+
+_ipfs_swarm_filters_add()
+{
+    _ipfs_help_only
+}
+
+_ipfs_swarm_filters_rm()
+{
+    _ipfs_help_only
+}
+
 _ipfs_swarm_peers()
 {
     _ipfs_help_only
@@ -302,23 +388,13 @@ _ipfs_tour_restart()
 }
 
 _ipfs_update()
-{
-    _ipfs_comp "check log --help"
-}
-
-_ipfs_update_check()
-{
-    _ipfs_help_only
-}
-
-_ipfs_update_log()
 {
     _ipfs_help_only
 }
 
 _ipfs_version()
 {
-    _ipfs_comp "-number --help"
+    _ipfs_comp "--number --help"
 }
 
 _ipfs()
@@ -328,9 +404,9 @@ _ipfs()
     
     case "${COMP_CWORD}" in
         1)  
-            local opts="add block bootstrap cat commands config daemon dht diag get id \
-                        init log ls mount name object pin ping refs repo swarm tour \
-                        update version"
+            local opts="add bitswap block bootstrap cat commands config daemon dht \
+                        diag dns file get id init log ls mount name object pin ping \
+                        refs repo swarm tour update version"
             COMPREPLY=( $(compgen -W "${opts}" -- ${word}) );;
         2)  
             local command="${COMP_WORDS[1]}"