diff --git a/AUTHORS b/AUTHORS
index a4cc02c5a..7df325488 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -332,3 +332,4 @@ suggestions:
   tom-doerr
   ad-si
   coaxial
+  Arvedui
diff --git a/ChangeLog b/ChangeLog
index 0aca25870..8dae0f95d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -95,6 +95,8 @@
            Thanks to Kirill Bobyrev
 - TW #1922 Can't find export scripts
            Thanks to tom-doerr
+- TW #2004 "shell" should not be expand to "exec tasksh"
+           Thanks to Arvedui
 - TW #2007 Compute number of current tasks correctly
            Thanks to Janik Rabe
 - TW #2020 reserved.lines is not affecting the burndown height
diff --git a/src/Context.cpp b/src/Context.cpp
index 6779065aa..004bbbd31 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -285,7 +285,6 @@ std::string configurationDefaults =
   "alias.history=history.monthly                  # Prefer monthly over annual history reports\n"
   "alias.ghistory=ghistory.monthly                # Prefer monthly graphical over annual history reports\n"
   "alias.burndown=burndown.weekly                 # Prefer the weekly burndown chart\n"
-  "alias.shell=exec tasksh                        # Alias old shell command to new shell\n"
   "\n"
   "# Reports\n"
   "\n"