diff --git a/AUTHORS b/AUTHORS
index b097a2b4d..ea2cdc19b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -77,6 +77,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Scott Kostyshak
   Erik Wenzel
   Štěpán Henek
+  Haitham Gad
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
diff --git a/ChangeLog.230 b/ChangeLog.230
index 6ac3736bc..a4527a089 100644
--- a/ChangeLog.230
+++ b/ChangeLog.230
@@ -3,7 +3,9 @@
 2.3.0 () -
 
 Features
- + Added Feature #934, support for 'reserved.lines' to accomodate multi-line
+ + #328 Replaced the 'shell' command with a standalone 'tasksh' binary, which
+   includes GNU readline support (thanks to Haitham Gad).
+ + #934 support for 'reserved.lines' to accomodate multi-line
    shell prompts when used in conjunction with 'limit:page' (thanks to Robert
    Gill).
  + Stores un-synched transactions in <data.location>/backlog.data.
diff --git a/NEWS b/NEWS
index 4294f9e55..cc8c819eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,11 +1,14 @@
 
 New Features in taskwarrior 2.3.0
 
-  - 
+  - New task server sync capabilities.
+  - New shell with Readline support.
 
 New commands in taskwarrior 2.3.0
 
   - New 'sync' command to synchronize data with a Task Server.
+  - New 'tasksh' command which replaces the old 'task shell' with an improved
+    standalone shell, featuring Readline support.
 
 New configuration options in taskwarrior 2.3.0
 
diff --git a/README b/README
index a2601ce12..5d498d355 100644
--- a/README
+++ b/README
@@ -2,9 +2,9 @@
                        *** during ongoing ***
                         *** development ***
 
-The development branch is a work in progress and may not pass all quality
-tests, therefore it may harm your data. While we welcome bug reports from
-the development branch, we do not guarantee proper or timely fixes.
+The development branch is a work in progress and may not pass all quality tests,
+therefore it may harm your data.  While we welcome bug reports from the
+development branch, we do not guarantee proper or timely fixes.
 
       Broken functionality may arise from ongoing development work.
 
diff --git a/doc/man/tasksh.1.in b/doc/man/tasksh.1.in
index ec32ff8c6..75c1065ff 100644
--- a/doc/man/tasksh.1.in
+++ b/doc/man/tasksh.1.in
@@ -149,7 +149,7 @@ ID Project Pri Due        Active Age   Description
 .RE
 
 .SH "CREDITS & COPYRIGHTS"
-Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
+Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
 
 This man page was originally written by Federico Hernandez.
 
diff --git a/src/shell/Readline.cpp b/src/shell/Readline.cpp
index da055625e..eaddafd10 100644
--- a/src/shell/Readline.cpp
+++ b/src/shell/Readline.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/src/shell/Readline.h b/src/shell/Readline.h
index 436bcafe6..648022e79 100644
--- a/src/shell/Readline.h
+++ b/src/shell/Readline.h
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
diff --git a/src/shell/main.cpp b/src/shell/main.cpp
index 0bcc9b87d..5d554c30e 100644
--- a/src/shell/main.cpp
+++ b/src/shell/main.cpp
@@ -1,7 +1,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 // taskwarrior - a command line task list manager.
 //
-// Copyright 2006-2012, Paul Beckingham, Federico Hernandez.
+// Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal