diff --git a/AUTHORS b/AUTHORS
index 03232e0cd..837ffe687 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,5 +1,5 @@
 Principal Author:
-  Paul Beckingham, paul@beckingham.net
+  Paul Beckingham
 
 Contributing Authors:
   Damian Glenny
@@ -13,6 +13,7 @@ Contributing Authors:
   Federico Hernandez
   T. Charles Yun
   David J Patrick
+  P.C. Shyamshankar
 
 With thanks to:
   Eugene Kramer
@@ -30,5 +31,4 @@ With thanks to:
   Eric Farris
   Bruce Dillahunty
   Askme Too
-  P.C. Shyamshankar
 
diff --git a/ChangeLog b/ChangeLog
index a9eb3b9b5..a4a528bce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,6 +27,8 @@
    other reports.
  + New "timesheet" command displays tasks completed and started, per week,
    and can display multiple weeks.
+ + New tab completion script, tab_completion.sh, for bash users (thanks
+   to Federico Hernandez).
 
 ------ old releases ------------------------------
 
diff --git a/DEVELOPERS b/DEVELOPERS
index 2eec979bc..6351d0819 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -18,5 +18,5 @@ included.
   color.cpp       Color support functions.
   rules.cpp       Auto-colorization rules.
 
-Don't forget, please send bugs, patches to task@beckingham.net
+Please send bugs, patches to task@beckingham.net
 
diff --git a/Makefile.am b/Makefile.am
index fb05a3a4a..485701364 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,3 @@
 SUBDIRS = src
-EXTRA_DIST = DEVELOPERS
+EXTRA_DIST = DEVELOPERS tab_completion.sh
 
diff --git a/html/task.html b/html/task.html
index 320b05941..793e72522 100644
--- a/html/task.html
+++ b/html/task.html
@@ -166,6 +166,8 @@
                       other reports.
                   <li>New "timesheet" command displays tasks completed and started, per week,
                       and can display multiple weeks.
+                  <li>New tab completion script, tab_completion.sh, for bash users (thanks
+                      to Federico Hernandez).
                 </ul>
 
                 <p>
diff --git a/tab_completion.sh b/tab_completion.sh
new file mode 100644
index 000000000..bea9e60b9
--- /dev/null
+++ b/tab_completion.sh
@@ -0,0 +1,24 @@
+_task() 
+{
+    local cur prev opts base
+
+    COMPREPLY=()
+    cur="${COMP_WORDS[COMP_CWORD]}"
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+    opts="add append annotate completed delete undelete info start stop done undo projects tags summary history ghistory next calendar stats import export color version help list long ls newest oldest overdue active"
+
+    case "${prev}" in
+      ls|list|long)
+        if [[ ${cur} == +* ]] ; then
+          local tags=$( task tags | egrep -v 'tags|^$'|sed 's/^/+/' )
+          COMPREPLY=( $(compgen -W "${tags}" -- ${cur}) )
+          return 0
+        fi
+        ;;
+    esac
+      
+    COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
+    return 0
+}
+complete -F _task task