diff --git a/AUTHORS b/AUTHORS
index 31bb6519f..6dd2c7ecf 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -192,3 +192,4 @@ suggestions:
   Michele Santullo
   Scott Kroll
   Kosta H
+  Hector Arciga
diff --git a/ChangeLog b/ChangeLog
index 08aa4e805..fa611af99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,7 +10,8 @@ Features
  + Removed deprecated 'push', 'pull' and 'merge' commands.
 
 Bugs
- + #1486 Truncated sentence in task-sync(5) manpage (thank to Jakub Wilk).
+ + #1486 Truncated sentence in task-sync(5) manpage (thanks to Jakub Wilk).
+ + #1487 `tasksh` segmentation fault (thanks to Hector Arciga).
  + Removed debugging code.
 
 ------ current release ---------------------------
diff --git a/src/shell/main.cpp b/src/shell/main.cpp
index 244b5e6f3..a69b78cc3 100644
--- a/src/shell/main.cpp
+++ b/src/shell/main.cpp
@@ -162,7 +162,7 @@ int main (int argc, const char** argv)
 
       // Escape special chars.
       size_t i = 0;
-      while ((i = command.find_first_of ("$*?!|&;<>(){}~#@", i)) != std::string::npos)
+      while ((i = command.find_first_of ("$*?!|&;<>(){}~#@\\", i)) != std::string::npos)
       {
         command.insert(i, 1, '\\');
         i += 2;