Index: /trunk/reviewboard/reviews/views.py
===================================================================
--- /trunk/reviewboard/reviews/views.py	(revision 1692)
+++ /trunk/reviewboard/reviews/views.py	(working copy)
@@ -406,10 +406,13 @@
 
     resp = HttpResponse(data, mimetype='text/x-patch')
 
-    if diffset.name == 'diff':
-        filename = "bug%s.patch" % review_request.bugs_closed.replace(',', '_')
-    else:
-        filename = diffset.name
+    filename = diffset.name
+    if filename == 'diff':
+        bugs = review_request.get_bug_list()
+        if bugs:
+            filename = "bug" + '_'.join(bugs) + ".patch"
+        else:
+            filename = "review" + review_request_id + ".patch"
 
     resp['Content-Disposition'] = 'inline; filename=%s' % filename