diff --git a/release/packages/generate-set-ucl.lua b/release/packages/generate-set-ucl.lua
--- a/release/packages/generate-set-ucl.lua
+++ b/release/packages/generate-set-ucl.lua
@@ -75,15 +75,15 @@
 -- Add dependencies from SET_DEPENDS.
 for dep in string.gmatch(pkgdeps, "[^%s]+") do
 	obj["deps"][dep] = {
-		["origin"] = "base"
+		["origin"] = "base/"..dep
 	}
 end
 
--- Add a version key to all dependencies, otherwise pkg doesn't like it.
+-- Add a version and origin key to all dependencies, otherwise pkg
+-- doesn't like it.
 for dep, opts in pairs(obj["deps"]) do
-	if obj["deps"][dep]["version"] == nil then
-		obj["deps"][dep]["version"] = pkgversion
-	end
+	obj["deps"][dep]["origin"] = obj["deps"][dep]["origin"] or "base/"..dep
+	obj["deps"][dep]["version"] = obj["deps"][dep]["version"] or pkgversion
 end
 
 -- If there are no dependencies, remove the deps key, otherwise pkg raises an
diff --git a/release/packages/generate-ucl.lua b/release/packages/generate-ucl.lua
--- a/release/packages/generate-ucl.lua
+++ b/release/packages/generate-ucl.lua
@@ -161,7 +161,7 @@
 	end
 	obj["deps"][pkggenname] = {
 		["version"] = pkgversion,
-		["origin"] = "base"
+		["origin"] = "base/"..pkgprefix.."-"..pkggenname,
 	}
 end
 
@@ -217,6 +217,8 @@
 	newdeps = {}
 	for dep, opts in pairs(obj["deps"]) do
 		local newdep = pkgprefix .. "-" .. dep
+		-- Make sure origin is set.
+		opts["origin"] = opts["origin"] or "base/"..newdep
 		newdeps[newdep] = opts
 	end
 	obj["deps"] = newdeps
diff --git a/release/packages/set-template.ucl b/release/packages/set-template.ucl
--- a/release/packages/set-template.ucl
+++ b/release/packages/set-template.ucl
@@ -4,7 +4,7 @@
 
 name = "${PKG_NAME_PREFIX}-set-${PKGNAME}"
 prefix = "/"
-origin = "base"
+origin = "base/${PKG_NAME_PREFIX}-set-${PKGNAME}"
 categories = [ base ]
 version = "${VERSION}"
 maintainer = "${PKG_MAINTAINER}"
diff --git a/release/packages/sets/base-dbg.ucl b/release/packages/sets/base-dbg.ucl
--- a/release/packages/sets/base-dbg.ucl
+++ b/release/packages/sets/base-dbg.ucl
@@ -25,10 +25,8 @@
 deps {
 	"set-minimal-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base-jail-dbg.ucl b/release/packages/sets/base-jail-dbg.ucl
--- a/release/packages/sets/base-jail-dbg.ucl
+++ b/release/packages/sets/base-jail-dbg.ucl
@@ -25,10 +25,8 @@
 deps {
 	"set-minimal-jail-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base-jail.ucl b/release/packages/sets/base-jail.ucl
--- a/release/packages/sets/base-jail.ucl
+++ b/release/packages/sets/base-jail.ucl
@@ -28,14 +28,11 @@
 deps {
 	"set-minimal-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-optional-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/base.ucl b/release/packages/sets/base.ucl
--- a/release/packages/sets/base.ucl
+++ b/release/packages/sets/base.ucl
@@ -31,14 +31,11 @@
 deps {
 	"set-minimal" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-optional" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 	"set-devel" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/sets/optional-dbg.ucl b/release/packages/sets/optional-dbg.ucl
--- a/release/packages/sets/optional-dbg.ucl
+++ b/release/packages/sets/optional-dbg.ucl
@@ -26,6 +26,5 @@
 deps {
 	"set-minimal-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional-jail-dbg.ucl b/release/packages/sets/optional-jail-dbg.ucl
--- a/release/packages/sets/optional-jail-dbg.ucl
+++ b/release/packages/sets/optional-jail-dbg.ucl
@@ -26,6 +26,5 @@
 deps {
 	"set-minimal-jail-dbg" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional-jail.ucl b/release/packages/sets/optional-jail.ucl
--- a/release/packages/sets/optional-jail.ucl
+++ b/release/packages/sets/optional-jail.ucl
@@ -29,6 +29,5 @@
 deps {
 	"set-minimal-jail" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/sets/optional.ucl b/release/packages/sets/optional.ucl
--- a/release/packages/sets/optional.ucl
+++ b/release/packages/sets/optional.ucl
@@ -28,6 +28,5 @@
 deps {
 	"set-minimal" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/at.ucl b/release/packages/ucl/at.ucl
--- a/release/packages/ucl/at.ucl
+++ b/release/packages/ucl/at.ucl
@@ -20,13 +20,11 @@
 	# atrun relies on cron to work.
 	"cron" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# at(1) passes the command to /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
 
diff --git a/release/packages/ucl/bluetooth.ucl b/release/packages/ucl/bluetooth.ucl
--- a/release/packages/ucl/bluetooth.ucl
+++ b/release/packages/ucl/bluetooth.ucl
@@ -20,7 +20,6 @@
 	# rfcomm_pppd(8) uses ppp(8)
 	"ppp" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
 
diff --git a/release/packages/ucl/bsdconfig.ucl b/release/packages/ucl/bsdconfig.ucl
--- a/release/packages/ucl/bsdconfig.ucl
+++ b/release/packages/ucl/bsdconfig.ucl
@@ -20,6 +20,5 @@
 	# bsdconfig is written in shell script, so it needs /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/bsdinstall.ucl b/release/packages/ucl/bsdinstall.ucl
--- a/release/packages/ucl/bsdinstall.ucl
+++ b/release/packages/ucl/bsdinstall.ucl
@@ -20,6 +20,5 @@
 	# bsdinstall is written in shell script, so it needs /bin/sh
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/caroot.ucl b/release/packages/ucl/caroot.ucl
--- a/release/packages/ucl/caroot.ucl
+++ b/release/packages/ucl/caroot.ucl
@@ -1,7 +1,6 @@
 deps {
 	"certctl": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 scripts: {
diff --git a/release/packages/ucl/certctl.ucl b/release/packages/ucl/certctl.ucl
--- a/release/packages/ucl/certctl.ucl
+++ b/release/packages/ucl/certctl.ucl
@@ -19,6 +19,5 @@
 deps {
 	"openssl": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/clang.ucl b/release/packages/ucl/clang.ucl
--- a/release/packages/ucl/clang.ucl
+++ b/release/packages/ucl/clang.ucl
@@ -1,11 +1,9 @@
 deps {
 	"lld" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 
 	"libcompiler_rt-dev" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/devd.ucl b/release/packages/ucl/devd.ucl
--- a/release/packages/ucl/devd.ucl
+++ b/release/packages/ucl/devd.ucl
@@ -20,6 +20,5 @@
 	# devd uses /bin/sh to invoke hooks.
 	"runtime" {
 		version = "${VERSION}"
-		origin = "base"
 	},
 }
diff --git a/release/packages/ucl/newsyslog.ucl b/release/packages/ucl/newsyslog.ucl
--- a/release/packages/ucl/newsyslog.ucl
+++ b/release/packages/ucl/newsyslog.ucl
@@ -2,6 +2,5 @@
 	# newsyslog uses bzip2 to compress log files.
 	"bzip2" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/periodic.ucl b/release/packages/ucl/periodic.ucl
--- a/release/packages/ucl/periodic.ucl
+++ b/release/packages/ucl/periodic.ucl
@@ -19,6 +19,5 @@
 deps {
 	"cron" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/rc.ucl b/release/packages/ucl/rc.ucl
--- a/release/packages/ucl/rc.ucl
+++ b/release/packages/ucl/rc.ucl
@@ -19,7 +19,6 @@
 deps {
 	"runtime": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
diff --git a/release/packages/ucl/rcmds.ucl b/release/packages/ucl/rcmds.ucl
--- a/release/packages/ucl/rcmds.ucl
+++ b/release/packages/ucl/rcmds.ucl
@@ -20,7 +20,6 @@
 	# The RPC daemons require rpcbind.
 	"utilities" {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
diff --git a/release/packages/ucl/sendmail.ucl b/release/packages/ucl/sendmail.ucl
--- a/release/packages/ucl/sendmail.ucl
+++ b/release/packages/ucl/sendmail.ucl
@@ -20,6 +20,5 @@
 	# sendmail requires make to build its configuration file.
 	"bmake": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
diff --git a/release/packages/ucl/tests-all.ucl b/release/packages/ucl/tests-all.ucl
--- a/release/packages/ucl/tests-all.ucl
+++ b/release/packages/ucl/tests-all.ucl
@@ -27,20 +27,17 @@
 	# Nearly all the tests require atf to run.
 	"atf": {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# The test framework requires Kyua.
 	"kyua": {
 		version = "${VERSION}"
-		origin = "base"
 	},
 
 	# Since the purpose of the tests is to test the base system, the base
 	# system must be installed.
 	"set-base": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }
 
diff --git a/release/packages/ucl/yp.ucl b/release/packages/ucl/yp.ucl
--- a/release/packages/ucl/yp.ucl
+++ b/release/packages/ucl/yp.ucl
@@ -20,6 +20,5 @@
 	# YP requires bmake to rebuild the database.
 	"bmake": {
 		version = "${VERSION}"
-		origin = "base"
 	}
 }