diff --git a/ChangeLog b/ChangeLog
index 922c266..da131a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-11-25  Franklin "Snaipe" Mathieu  <franklinmathieu@gmail.com>
+
+    * criterion: version 2.1.1
+    * Fix: Fixed bug where the TAP output access the assert message after
+      it has been freed, causing it to print garbage.
+
 2015-09-21  Franklin "Snaipe" Mathieu  <franklinmathieu@gmail.com>
 
     * criterion: version 2.1.0
diff --git a/src/core/stats.c b/src/core/stats.c
index a9dbe95..5d020e1 100644
--- a/src/core/stats.c
+++ b/src/core/stats.c
@@ -183,6 +183,7 @@ static void push_assert(s_glob_stats *stats,
 
     s_assert_stats *dup = smalloc(sizeof (s_assert_stats));
     memcpy(dup, data, sizeof (s_assert_stats));
+    dup->message = strdup(data->message);
 
     dup->next = test->asserts;
     test->asserts = dup;