diff --git a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist
new file mode 100644
index 00000000000..96858f5c56d
--- /dev/null
+++ b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel-static.plist
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!-- Prefer the xbps-devel-static pkg over other alternatices -->
+	<key>virtual-pkgver</key>
+	<string>xbps-static-9999</string>
+	<key>target-pkgpattern</key>
+	<string>xbps-devel-static>=0</string>
+</dict>
+</plist>
diff --git a/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist
new file mode 100644
index 00000000000..3778450d355
--- /dev/null
+++ b/srcpkgs/xbps-devel/files/virtualpkg.d/xbps-devel.plist
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!-- Prefer the xbps-devel pkg over other alternatices -->
+	<key>virtual-pkgver</key>
+	<string>xbps-9999</string>
+	<key>target-pkgpattern</key>
+	<string>xbps-devel>=0</string>
+</dict>
+</plist>
diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index 8394a761d2d..3837c1f4221 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -13,7 +13,7 @@ long_desc="
  binary package manager. This packages includes code from a development
  branch available from https://github.com/xtraeme/xbps"
 
-conf_files="/etc/xbps-conf.plist"
+conf_files="/etc/xbps/conf.plist /etc/xbps/repositories.plist"
 subpackages="$pkgname-static"
 provides="xbps-9999"
 replaces="xbps>=0"
@@ -41,3 +41,8 @@ do_fetch() {
 	msg_normal " Fetching source from $url ...\n"
 	git clone ${url} ${pkgname}-${version}
 }
+
+post_install() {
+	vinstall ${FILESDIR}/virtualpkg.d/xbps-devel.plist \
+		644 etc/xbps/virtualpkg.d
+}
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template
index 1fcdec7e6cc..d7f97f9aced 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-devel/xbps-devel-static.template
@@ -8,12 +8,14 @@ long_desc="${long_desc}
 
 provides="xbps-static-9999"
 replaces="xbps-static>=0"
+
 Add_dependency run xbps-triggers
 
 do_install()
 {
-	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/sbin/*.static ${DESTDIR}/sbin
-	mv ${SRCPKGDESTDIR}/lib/*.a ${DESTDIR}/usr/lib
+	vmove usr/include usr
+	vmove "sbin/*.static" sbin
+	vmove "lib/*.a" usr/lib
+	vinstall ${FILESDIR}/virtualpkg.d/xbps-devel-static.plist \
+		644 etc/xbps/virtualpkg.d
 }