diff --git a/srcpkgs/xbps-devel/template b/srcpkgs/xbps-devel/template
index df2d1a29081..4cf322a85c2 100644
--- a/srcpkgs/xbps-devel/template
+++ b/srcpkgs/xbps-devel/template
@@ -16,12 +16,15 @@ replaces="xbps"
 nofetch=yes
 noextract=yes
 
-Add_dependency full glibc
-Add_dependency full libarchive
-Add_dependency full proplib
-Add_dependency full openssl
+Add_dependency run glibc
+Add_dependency run libarchive
+Add_dependency run proplib
+Add_dependency run openssl
 Add_dependency build bzr
 Add_dependency build asciidoc
+Add_dependency build libarchive-devel
+Add_dependency build proplib-devel
+Add_dependency build openssl-devel
 
 do_fetch()
 {
diff --git a/srcpkgs/xbps-devel/xbps-devel-static.template b/srcpkgs/xbps-devel/xbps-devel-static.template
index b2e21a5d45f..97f9f64d6ca 100644
--- a/srcpkgs/xbps-devel/xbps-devel-static.template
+++ b/srcpkgs/xbps-devel/xbps-devel-static.template
@@ -1,4 +1,4 @@
-# Template file for 'bzip2-devel'.
+# Template file for 'xbps-devel-static'.
 #
 short_desc="${sourcepkg} static binaries"
 long_desc="${long_desc}
@@ -11,6 +11,7 @@ replaces="xbps-static"
 do_install()
 {
 	mkdir -p ${DESTDIR}/sbin ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/include ${DESTDIR}/usr/include
 	mv ${SRCPKGDESTDIR}/sbin/*.static ${DESTDIR}/sbin
 	mv ${SRCPKGDESTDIR}/lib/*.a ${DESTDIR}/usr/lib
 }