Index: flavormaker.py
===================================================================
--- flavormaker.py      (revision 1706)
+++ flavormaker.py      (working copy)
@@ -169,8 +169,8 @@
     current_abi_list = os.listdir(abidir)
     current_abi_list.sort()
     old_abi = current_abi_list[0]
-    self._quietRun('cp -r %s/%s %s/%s' %
-                   (abidir, old_abi, abidir, self._version()))
+    self._quietRun('cp -r %s/%s %s/%s~%s' %
+                   (abidir, old_abi, abidir, self._version(), options.version))

   def _addFlavorCustomConfigOpts(self, name, arch):
     flavordir = ('%s/%s/debian/binary-custom.d/%s' %