diff --git a/build_packages b/build_packages
index c225f08e16..f2952bd2f4 100755
--- a/build_packages
+++ b/build_packages
@@ -42,6 +42,8 @@ DEFINE_boolean skip_torcx_store "${FLAGS_FALSE}" \
   "Don't build a new torcx store from the updated sysroot."
 DEFINE_string torcx_extra_pkg_url "" \
   "URL to directory where the torcx packages will be available for downloading"
+DEFINE_boolean only_resolve_circular_deps "${FLAGS_FALSE}" \
+  "Don't build all packages; only resolve circular dependencies, then stop."
 
 # include upload options
 . "${BUILD_LIBRARY_DIR}/release_util.sh" || exit 1
@@ -278,6 +280,11 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_FALSE}" ]]; then
                  sys-apps/systemd cryptsetup
 fi
 
+if [[ "${FLAGS_only_resolve_circular_deps}" -eq "${FLAGS_TRUE}" ]]; then
+  info "Circular dependencies resolved. Stopping as requested."
+  exit
+fi
+
 export KBUILD_BUILD_USER="${BUILD_USER:-build}"
 export KBUILD_BUILD_HOST="${BUILD_HOST:-pony-truck.infra.kinvolk.io}"