diff -U 3 -H -d -r -N -- duplicity-0.6.22_orig/duplicity/commandline.py duplicity-0.6.22/duplicity/commandline.py
--- duplicity-0.6.22_orig/duplicity/commandline.py	2013-08-22 15:30:08.000000000 +0200
+++ duplicity-0.6.22/duplicity/commandline.py	2013-11-24 08:40:14.348030806 +0100
@@ -245,6 +245,9 @@
     # source directory doesn't match previous backup source directory.
     parser.add_option("--allow-source-mismatch", action="store_true")
 
+   # If this is true generate the alternate filenames.
+    parser.add_option("--alternate-filenames", action="store_true")
+
     # Set to the path of the archive directory (the directory which
     # contains the signatures and manifests of the relevent backup
     # collection), and for checkpoint state between volumes.
@@ -958,6 +961,9 @@
             if m:
                 n+=1
         assert n <= 1, "Invalid syntax, two conflicting modes specified"
+    
+    assert (not(globals.alternate_filenames and globals.short_filenames)), command_line_error("--alternate-filenames and --short-filenames cannot be used in combination")
+    
     if action in ["list-current", "collection-status",
                   "cleanup", "remove-old", "remove-all-but-n-full", "remove-all-inc-of-but-n-full"]:
         assert_only_one([list_current, collection_status, cleanup,
diff -U 3 -H -d -r -N -- duplicity-0.6.22_orig/duplicity/file_naming.py duplicity-0.6.22/duplicity/file_naming.py
--- duplicity-0.6.22_orig/duplicity/file_naming.py	2013-08-22 15:30:08.000000000 +0200
+++ duplicity-0.6.22/duplicity/file_naming.py	2013-11-24 08:58:12.647499359 +0100
@@ -55,10 +55,10 @@
     if full_vol_re:
         return
 
-    full_vol_re = re.compile("^" + globals.file_prefix + "duplicity-full"
+    full_vol_re = re.compile("^" + globals.file_prefix + "duplicity-full(-difftar|)"
                          "\\.(?P<time>.*?)"
                          "\\.vol(?P<num>[0-9]+)"
-                         "\\.difftar"
+                         "(\\.difftar|)"
                          "(?P<partial>(\\.part))?"
                          "($|\\.)")
 
@@ -69,9 +69,9 @@
                                "(?P<partial>(\\.p))?"
                                "($|\\.)")
 
-    full_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-full"
+    full_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-full(-manifest|)"
                               "\\.(?P<time>.*?)"
-                              "\\.manifest"
+                              "(\\.manifest|)"
                               "(?P<partial>(\\.part))?"
                               "($|\\.)")
 
@@ -81,11 +81,11 @@
                                     "(?P<partial>(\\.p))?"
                                     "($|\\.)")
 
-    inc_vol_re = re.compile("^" + globals.file_prefix + "duplicity-inc"
+    inc_vol_re = re.compile("^" + globals.file_prefix + "duplicity-inc(-difftar|)"
                         "\\.(?P<start_time>.*?)"
                         "\\.to\\.(?P<end_time>.*?)"
                         "\\.vol(?P<num>[0-9]+)"
-                        "\\.difftar"
+                        "(\\.difftar|)"
                         "($|\\.)")
 
     inc_vol_re_short = re.compile("^" + globals.file_prefix + "di"
@@ -95,11 +95,11 @@
                               "\\.dt"
                               "($|\\.)")
 
-    inc_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-inc"
+    inc_manifest_re = re.compile("^" + globals.file_prefix + "duplicity-inc(-manifest|)"
                              "\\.(?P<start_time>.*?)"
                              "\\.to"
                              "\\.(?P<end_time>.*?)"
-                             "\\.manifest"
+                             "(\\.manifest|)"
                              "(?P<partial>(\\.part))?"
                              "(\\.|$)")
 
@@ -233,36 +233,73 @@
                         (dup_time.prevtimestr, dup_time.curtimestr,
                          part_string, suffix))
     else:
-        assert volume_number or manifest
-        assert not (volume_number and manifest)
-        if volume_number:
-            if globals.short_filenames:
-                vol_string = "%s.dt" % to_base36(volume_number)
+        
+        if globals.alternate_filenames:
+            assert volume_number or manifest
+            assert not (volume_number and manifest)
+            if volume_number:
+                vol_string = "%s" % to_base36(volume_number)
+                if type == "full":
+                        return ("duplicity-full-difftar.%s.vol%s%s%s" % (dup_time.curtimestr,
+                                                              vol_string, part_string, suffix))
+                
+                elif type == "inc":
+
+                        return ("duplicity-inc-difftar.%s.to.%s.vol%s%s%s" % (dup_time.prevtimestr,
+                                                                   dup_time.curtimestr,
+                                                                   vol_string, part_string, suffix))
+                else:
+                    assert 0
+
             else:
-                vol_string = "vol%d.difftar" % volume_number
+                vol_string = ""
+                
+                if type == "full":
+                        return ("duplicity-full-manifest.%s%s%s" % (dup_time.curtimestr,
+                                                                part_string, suffix))
+                
+                elif type == "inc":
+                        return ("duplicity-inc-manifest.%s.to.%s%s%s%s" % (dup_time.prevtimestr,
+                                                                   dup_time.curtimestr,
+                                                                   vol_string, part_string, suffix))
+                else:
+                    assert 0
+            
+        
         else:
-            if globals.short_filenames:
-                vol_string = "m"
-            else:
-                vol_string = "manifest"
-        if type == "full":
-            if globals.short_filenames:
-                return ("df.%s.%s%s%s" % (to_base36(dup_time.curtime),
-                                          vol_string, part_string, suffix))
+            assert volume_number or manifest
+            assert not (volume_number and manifest)
+            if volume_number:
+                if globals.short_filenames:
+                    vol_string = "%s.dt" % to_base36(volume_number)
+                else:
+                    vol_string = "vol%d.difftar" % volume_number
             else:
-                return ("duplicity-full.%s.%s%s%s" % (dup_time.curtimestr,
-                                                      vol_string, part_string, suffix))
-        elif type == "inc":
-            if globals.short_filenames:
-                return ("di.%s.%s.%s%s%s" % (to_base36(dup_time.prevtime),
-                                             to_base36(dup_time.curtime),
-                                             vol_string, part_string, suffix))
+                if globals.short_filenames:
+                    vol_string = "m"
+                else:
+                    vol_string = "manifest"
+           
+        
+            if type == "full":
+                if globals.short_filenames:
+                    return ("df.%s.%s%s%s" % (to_base36(dup_time.curtime),
+                                              vol_string, part_string, suffix))
+                else:
+                    return ("duplicity-full.%s.%s%s%s" % (dup_time.curtimestr,
+                                                          vol_string, part_string, suffix))
+            
+            elif type == "inc":
+                if globals.short_filenames:
+                    return ("di.%s.%s.%s%s%s" % (to_base36(dup_time.prevtime),
+                                                 to_base36(dup_time.curtime),
+                                                 vol_string, part_string, suffix))
+                else:
+                    return ("duplicity-inc.%s.to.%s.%s%s%s" % (dup_time.prevtimestr,
+                                                               dup_time.curtimestr,
+                                                               vol_string, part_string, suffix))
             else:
-                return ("duplicity-inc.%s.to.%s.%s%s%s" % (dup_time.prevtimestr,
-                                                           dup_time.curtimestr,
-                                                           vol_string, part_string, suffix))
-        else:
-            assert 0
+                assert 0
 
 
 def parse(filename):
diff -U 3 -H -d -r -N -- duplicity-0.6.22_orig/duplicity/globals.py duplicity-0.6.22/duplicity/globals.py
--- duplicity-0.6.22_orig/duplicity/globals.py	2013-08-22 15:30:09.000000000 +0200
+++ duplicity-0.6.22/duplicity/globals.py	2013-11-22 16:50:02.309250000 +0100
@@ -97,6 +97,9 @@
 # source directory doesn't match previous backup source directory.
 allow_source_mismatch = None
 
+# If this is true generate the alternate filenames.
+alternate_filenames = None
+
 # If set, abort if cannot do an incremental backup.  Otherwise if
 # signatures not found, default to full.
 incremental = None