Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9836)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py	(revision 9837)
@@ -1589,4 +1589,5 @@
         acronym = grok.getSite()['configuration'].acronym.replace(' ','')
         filename = "%s_%s" % (acronym, os.path.basename(path))
+        filename = filename.replace('.csv', '_%s.csv' % job_id)
         self.response.setHeader(
             'Content-Type', 'text/csv; charset=UTF-8')
Index: /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 9836)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/browser/tests/test_browser.py	(revision 9837)
@@ -211,5 +211,5 @@
                          'text/csv; charset=UTF-8')
         self.assertEqual(self.browser.headers['content-disposition'],
-                         'attachment; filename="WAeUP.Kofa_faculties.csv')
+            'attachment; filename="WAeUP.Kofa_faculties_%s.csv' % job_id)
         self.assertEqual(self.browser.contents,
             'code,title,title_prefix,users_with_local_roles\r\n'
@@ -227,5 +227,6 @@
                         'faculties, job_id=' in logcontent)
         self.assertTrue('zope.mgr - browser.pages.ExportCSVView - '
-                        'downloaded: WAeUP.Kofa_faculties.csv, job_id=' in logcontent)
+                        'downloaded: WAeUP.Kofa_faculties_%s.csv, job_id=%s'
+                        % (job_id, job_id) in logcontent)
         return
 
@@ -298,7 +299,7 @@
         self.browser.getLink("Download").click()
         self.assertEqual(self.browser.headers['content-type'],
-                         'text/csv; charset=UTF-8')
+          'text/csv; charset=UTF-8')
         self.assertEqual(self.browser.headers['content-disposition'],
-                         'attachment; filename="WAeUP.Kofa_students.csv')
+          'attachment; filename="WAeUP.Kofa_students_%s.csv' % job_id)
         # No students yet
         self.assertEqual(self.browser.contents,
@@ -319,5 +320,6 @@
         self.assertTrue(
             'zope.mgr - browser.pages.ExportCSVView '
-            '- downloaded: WAeUP.Kofa_students.csv, job_id=' in logcontent)
+            '- downloaded: WAeUP.Kofa_students_%s.csv, job_id=%s'
+            % (job_id, job_id) in logcontent)
         return
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 9836)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py	(revision 9837)
@@ -2762,5 +2762,5 @@
             'text/csv; charset=UTF-8')
         self.assertTrue(
-            'filename="WAeUP.Kofa_students.csv' in
+            'filename="WAeUP.Kofa_students_%s.csv' % job_id in
             self.browser.headers['content-disposition'])
         self.assertEqual(len(self.app['datacenter'].running_exports), 1)
@@ -2780,8 +2780,9 @@
         self.assertTrue(
             'zope.mgr - students.browser.ExportJobContainerDownload '
-            '- downloaded: WAeUP.Kofa_students.csv, job_id='
+            '- downloaded: WAeUP.Kofa_students_%s.csv, job_id=%s'
+            % (job_id, job_id)
             )
         self.assertTrue(
             'zope.mgr - students.browser.ExportJobContainerOverview '
-            '- discarded: job_id='
+            '- discarded: job_id=%s' % job_id
             )
