diff --git a/include/xbps_api.h.in b/include/xbps_api.h.in
index 694ae07e..ae9414d3 100644
--- a/include/xbps_api.h.in
+++ b/include/xbps_api.h.in
@@ -64,7 +64,7 @@
  */
 #define XBPS_PKGINDEX_VERSION	"1.6"
 
-#define XBPS_API_VERSION	"20121202"
+#define XBPS_API_VERSION	"20121207"
 
 #ifndef XBPS_VERSION
  #define XBPS_VERSION		"UNSET"
diff --git a/lib/rindex_sync.c b/lib/rindex_sync.c
index 125ffebb..184610f4 100644
--- a/lib/rindex_sync.c
+++ b/lib/rindex_sync.c
@@ -101,7 +101,7 @@ xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf)
 	/*
 	 * Remote repository plist index full URL.
 	 */
-	rpidx = xbps_xasprintf("%s/%s", uri, plistf);
+	rpidx = xbps_xasprintf("%s/%s-%s", uri, xhp->un_machine, plistf);
 	/*
 	 * Full path to repository directory to store the plist
 	 * index file.
@@ -110,7 +110,8 @@ xbps_rindex_sync(struct xbps_handle *xhp, const char *uri, const char *plistf)
 	/*
 	 * Full path to the local repository index file.
 	 */
-	lrepofile = xbps_xasprintf("%s/%s", lrepodir, plistf);
+	lrepofile = xbps_xasprintf("%s/%s-%s", lrepodir,
+			xhp->un_machine, plistf);
 	/*
 	 * Create repodir in metadir.
 	 */
diff --git a/lib/util.c b/lib/util.c
index 8f7422a5..0e0127c0 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -179,7 +179,8 @@ get_pkg_index_remote_plist(struct xbps_handle *xhp,
 	if (uri_fixed == NULL)
 		return NULL;
 
-	repodir = xbps_xasprintf("%s/%s/%s", xhp->metadir, uri_fixed, plistf);
+	repodir = xbps_xasprintf("%s/%s/%s-%s", xhp->metadir,
+			uri_fixed, xhp->un_machine, plistf);
 	free(uri_fixed);
 	return repodir;
 }