diff --git a/pkgfs.sh b/pkgfs.sh
index bc084196b68..570e9cb16e4 100755
--- a/pkgfs.sh
+++ b/pkgfs.sh
@@ -319,6 +319,8 @@ reset_tmpl_vars()
 	for i in ${TMPL_VARS}; do
 		eval unset "$i"
 	done
+
+	unset_build_vars
 }
 
 #