diff --git a/srcpkgs/base-files/files/vkpurge b/srcpkgs/base-files/files/vkpurge
index 4471c35d68d..c019f1809d6 100644
--- a/srcpkgs/base-files/files/vkpurge
+++ b/srcpkgs/base-files/files/vkpurge
@@ -88,6 +88,10 @@ remove_kernel()
 	fi
 	# Execute post-remove kernel hooks.
 	run_hooks post-remove $rmkver
+	# Remove kernel-headers.
+	if [ -d /usr/src/kernel-headers-${rmkver} ]; then
+		rm -rf /usr/src/kernel-headers-${rmkver}
+	fi
 }
 
 if [ "$1" = "list" ]; then
diff --git a/srcpkgs/base-files/template b/srcpkgs/base-files/template
index 414e0f49791..86423cebe97 100644
--- a/srcpkgs/base-files/template
+++ b/srcpkgs/base-files/template
@@ -1,6 +1,6 @@
 # Template file for 'base-files'
 pkgname=base-files
-version=0.82
+version=0.83
 revision=1
 bootstrap=yes
 makedepends="base-directories xbps-triggers"
@@ -63,7 +63,6 @@ base-files_package() {
 	noarch="yes"
 	depends="base-directories xbps-triggers"
 	pkg_install() {
-		vmove etc
-		vmove usr
+		vmove all
 	}
 }