diff --git a/pym/update/update.py b/pym/update/update.py
index 24a4249..b0edba6 100644
--- a/pym/update/update.py
+++ b/pym/update/update.py
@@ -377,6 +377,10 @@ class Update(MethodsInterface):
             dv.Select(["cl_update_rep_url", "cl_update_rep_path",
                        "cl_update_rep_rev"],
                       where="cl_update_rep_name", eq=repname, limit=1))
+
+        if revision == "master" and (
+            repname in ("calculate", "distros", "gentoo", "portage")):
+            revision = "master64"
         if not url or not rpath:
             raise UpdateError(_("Configuration variables for repositories "
                                 "are not setup"))
diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py
index 11ac8ac..8d5906f 100644
--- a/pym/update/variables/update.py
+++ b/pym/update/variables/update.py
@@ -246,7 +246,7 @@ class VariableClUpdateBranch(Variable):
     def get(self):
         arch = self.Get(self.arch_var)
         if arch == "x86_64":
-            return "master64"
+            return "master"
         else:
             return "master"
 
@@ -1030,7 +1030,7 @@ class VariableClUpdateProfileBranch(Variable):
     def get(self):
         arch = self.Get("main.os_arch_machine")
         if arch == "x86_64":
-            return "master64"
+            return "master"
         else:
             return "master"