diff --git a/lfs/baselayout-0.1.PKGBUILD b/lfs/baselayout-0.1-r1.PKGBUILD
similarity index 85%
rename from lfs/baselayout-0.1.PKGBUILD
rename to lfs/baselayout-0.1-r1.PKGBUILD
index 9a77480..6f56195 100644
--- a/lfs/baselayout-0.1.PKGBUILD
+++ b/lfs/baselayout-0.1-r1.PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=baselayout
-pkgver=0.1
+pkgver=0.1-r1
 pkgdesc="basic layout of filesystem"
 license=("GPL")
 sources=()
@@ -7,6 +7,24 @@ urls=()
 sha512sums=()
 
 src_install() {
+  mkdir -pv "${pkgdir}"/{boot,home,mnt,opt,srv}
+  mkdir -pv "${pkgdir}"/etc/{opt,sysconfig}
+  mkdir -pv "${pkgdir}"/lib/firmware
+  mkdir -pv "${pkgdir}"/usr/{,local/}{include,src}
+  mkdir -pv "${pkgdir}"/usr/lib/locale
+  mkdir -pv "${pkgdir}"/usr/local/{bin,lib,sbin}
+  mkdir -pv "${pkgdir}"/usr/{,local/}share/{color,dict,doc,info,locale,man}
+  mkdir -pv "${pkgdir}"/usr/{,local/}share/{misc,terminfo,zoneinfo}
+  mkdir -pv "${pkgdir}"/usr/{,local/}share/man/man{1..8}
+  mkdir -pv "${pkgdir}"/var/{cache,local,log,mail,opt,spool}
+  mkdir -pv "${pkgdir}"/var/lib/{color,misc,locate}
+
+  ln -svf ../run "${pkgdir}"/var/run
+  ln -svf ../../run/lock "${pkgdir}"/var/lock
+
+  install -dv -m 0750 "${pkgdir}"/root
+  install -dv -m 1777 "${pkgdir}"/tmp "${pkgdir}"/var/tmp
+
   install -vd "${pkgdir}/etc"
   ln -sv ../proc/self/mounts "${pkgdir}"/etc/mtab
   cat > "${pkgdir}"/etc/hosts << EOF