diff --git a/cinnabar/githg.py b/cinnabar/githg.py
index b35053932..592735b2b 100644
--- a/cinnabar/githg.py
+++ b/cinnabar/githg.py
@@ -1317,15 +1317,19 @@ def tagset_lines(tags):
                     "Error in file %s" % node.decode('ascii', 'replace'))
         if busted:
             import json
-            extra = ""
+            extra = bundle = ""
             if getbundle_params:
                 extra = \
                     "If it failed, please also copy/paste the following:\n"
                 extra += json.dumps(getbundle_params, sort_keys=True, indent=4)
+            if check_enabled('unbundler') and "GIT_DIR" in os.environ:
+                bundle = "Please keep a copy of the "
+                bundle += os.environ["GIT_DIR"] + "/cinnabar-last-bundle file"
+                bundle += " before doing the following.\n"
             raise Abort(
                 "It seems you have hit a known, rare, and difficult to "
                 "reproduce issue.\n"
-                "Your help would be appreciated.\n"
+                "Your help would be appreciated.\n" + bundle +
                 "Please try either `git cinnabar rollback` followed by the "
                 "same command that just\n"
                 "failed, or `git cinnabar reclone`.\n"
@@ -1333,5 +1337,5 @@ def tagset_lines(tags):
                 "(https://github.com/glandium/git-cinnabar/issues/new)\n"
                 "mentioning issue #207 and reporting whether the second "
                 "attempt succeeded.\n" + extra + "\n"
-                "Please keep a copy of this repository."
+                "Please read all the above and keep a copy of this repository."
             )