diff --git a/bin/xbps-rindex/index-add.c b/bin/xbps-rindex/index-add.c
index 15dac9cc..13123a86 100644
--- a/bin/xbps-rindex/index-add.c
+++ b/bin/xbps-rindex/index-add.c
@@ -391,9 +391,9 @@ out:
 
 earlyout:
 	if (repo)
-		xbps_repo_close(repo);
+		xbps_repo_release(repo);
 	if (stage)
-		xbps_repo_close(stage);
+		xbps_repo_release(stage);
 
 	xbps_repo_unlock(rlockfd, rlockfname);
 
diff --git a/bin/xbps-rindex/index-clean.c b/bin/xbps-rindex/index-clean.c
index 9e8cdcdb..b6c57c95 100644
--- a/bin/xbps-rindex/index-clean.c
+++ b/bin/xbps-rindex/index-clean.c
@@ -172,9 +172,9 @@ index_clean(struct xbps_handle *xhp, const char *repodir, const bool hashcheck,
 	}
 
 out:
-	xbps_repo_close(repo);
+	xbps_repo_release(repo);
 	if(stage)
-		xbps_repo_close(stage);
+		xbps_repo_release(stage);
 	xbps_repo_unlock(rlockfd, rlockfname);
 
 	return rv;
diff --git a/bin/xbps-rindex/remove-obsoletes.c b/bin/xbps-rindex/remove-obsoletes.c
index 80cf2fff..5ae9ccd2 100644
--- a/bin/xbps-rindex/remove-obsoletes.c
+++ b/bin/xbps-rindex/remove-obsoletes.c
@@ -159,9 +159,9 @@ remove_obsoletes(struct xbps_handle *xhp, const char *repodir)
 	repos[0] = repo;
 	repos[1] = stage;
 	rv = xbps_array_foreach_cb_multi(xhp, array, NULL, cleaner_cb, repos);
-	xbps_repo_close(repo);
+	xbps_repo_release(repo);
 	if(stage)
-		xbps_repo_close(stage);
+		xbps_repo_release(stage);
 	xbps_object_release(array);
 
 	return rv;
diff --git a/bin/xbps-rindex/sign.c b/bin/xbps-rindex/sign.c
index 666f7e24..4c7d4a79 100644
--- a/bin/xbps-rindex/sign.c
+++ b/bin/xbps-rindex/sign.c
@@ -248,7 +248,7 @@ out:
 		rsa = NULL;
 	}
 	if (repo)
-		xbps_repo_close(repo);
+		xbps_repo_release(repo);
 
 	return rv ? -1 : 0;
 }
diff --git a/lib/repo.c b/lib/repo.c
index 224482ba..4547d0cd 100644
--- a/lib/repo.c
+++ b/lib/repo.c
@@ -361,7 +361,7 @@ xbps_repo_open(struct xbps_handle *xhp, const char *url)
 		}
 		xbps_object_iterator_release(iter);
 		xbps_object_release(repo->idx);
-		xbps_repo_close(stage);
+		xbps_repo_release(stage);
 		repo->idx = idx;
 		return repo;
 	}