diff --git a/builder-chroot b/builder-chroot
index bad943e..ad9a592 100755
--- a/builder-chroot
+++ b/builder-chroot
@@ -9,13 +9,6 @@ build_pkg() {
 	package="$1"
 	repo="$2"
 
-	[[ -d "${cfg_repos_dir}/${repo}" ]] || {
-		echo "Creating ${cfg_repos_dir}/${repo}"
-		mkdir -p "${cfg_repos_dir}/${repo}" || {
-			return 1
-		}
-	}
-
 	echo -n "Building ${repo}/${package}... "
 
 	cd "/tmp/build-${package}"
@@ -26,10 +19,22 @@ main() {
 	source 'builder-chroot.cfg'
 
 	package="$1"
-	repo_name="$2"
+
+	if [[ -d "/tmp/build-${package}/.spark.repo" ]]; then
+		repo_name=$( <"/tmp/build-${package}/.spark.repo" )
+	else
+		err "Repo not specified, not building package."
+	fi
 
 	build_pkg "$package" "$repo_name"
 
+	if [[ ! -d "${cfg_repos_dir}/${repo_name}" ]]; then
+		echo "Creating ${cfg_repos_dir}/${repo}"
+		mkdir -p "${cfg_repos_dir}/${repo}" || {
+			return 1
+		}
+	fi
+
 	cd "${cfg_repos_dir}/${repo_name}"
 	repo-add -n "${repo_name}.db.tar.gz" "$package"*.pkg.tar.xz
 }