diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4ccfd4c8..ddb6f4e13 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+v2.1.1
+======
+* The hwhoops release, finish/done behavior is handled elsewhere
+
 v2.1.0
 ======
 * Introduce Response.finish() to indicate that a message should not be
diff --git a/package.json b/package.json
index 8d1bc824a..5230f39c9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name":        "hubot",
-  "version":     "2.1.0",
+  "version":     "2.1.1",
   "author":      "hubot",
   "keywords":    "github hubot campfire bot",
   "description": "A simple helpful Robot for your Company",
diff --git a/src/robot.coffee b/src/robot.coffee
index eca73cbcb..a80dccf6c 100644
--- a/src/robot.coffee
+++ b/src/robot.coffee
@@ -90,11 +90,10 @@ class Robot
   # Returns nothing.
   receive: (message) ->
     for listener in @listeners
-      unless message.done
-        try
-          listener.call message
-        catch ex
-          @logger.error "Unable to call the listener: #{ex}"
+      try
+        listener.call message
+      catch ex
+        @logger.error "Unable to call the listener: #{ex}"
 
 
   # Public: Loads every script in the given path.
@@ -302,7 +301,7 @@ class Listener
   # Returns nothing.
   call: (message) ->
     if match = @matcher message
-      @callback new @robot.Response(@robot, message, match)
+      @callback new @robot.Response(@robot, message, match) unless message.done
 
 class TextListener extends Listener
   # TextListeners receive every message from the chat source and decide if they want
diff --git a/src/templates/package.json b/src/templates/package.json
index b6f02a811..9354b19aa 100644
--- a/src/templates/package.json
+++ b/src/templates/package.json
@@ -15,7 +15,7 @@
   },
 
   "dependencies": {
-    "hubot": "2.1.0",
+    "hubot": "2.1.1",
     "hubot-scripts": "2.0.2",
     "optparse": "1.0.3"
   }