diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 2c7b5de..f223fd7 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -172,9 +172,7 @@ otherwise it is in /bin.-->
                                                         ]//userinput"
            mode="pkgmngt"/>
       </xsl:if>
-      <xsl:if test="contains(@id,'createfiles')
-                and $pkgmngt='y'
-                and $bashdir='/tools'">
+      <xsl:if test="contains(@id,'createfiles') and $pkgmngt='y'">
         <xsl:apply-templates
            select="document('packageManager.xml')//sect1[
                                        @id='ch-pkgmngt-createfiles'
diff --git a/pkgmngt/packInstall.sh.pacman b/pkgmngt/packInstall.sh.pacman
index d8651d2..00d036c 100644
--- a/pkgmngt/packInstall.sh.pacman
+++ b/pkgmngt/packInstall.sh.pacman
@@ -33,10 +33,10 @@ rm -fv ./usr/share/info/dir  # recommended since this directory is already there
 # Right now, we have the files in the current directory. They should be moved
 # to /sources/$PACKAGE/src.
 mkdir -p ../$PACKAGE/src
-# We'll build as user tester. We need this directory to be owned by that user.
-chown -R tester ../$PACKAGE
+# We'll build as user builder. We need this directory to be owned by that user.
+chown -R builder ../$PACKAGE
 mv * ../$PACKAGE/src
-chown -R tester $PKG_DEST
+chown -R builder $PKG_DEST
 chmod -R o+r ../$PACKAGE
 
 cat > PKGBUILD <<EOF
@@ -51,7 +51,7 @@ cp -a * \$pkgdir
 }
 EOF
 # Building the binary package
-su tester -c"PATH=$PATH; makepkg -c --skipinteg" || true
+su builder -c"PATH=$PATH; makepkg -c --skipinteg" || true
 # Installing it on LFS
 if ! pacman -U --noconfirm /var/lib/packages/$ARCHIVE_NAME; then
      pacman -U --noconfirm --overwrite '*' /var/lib/packages/$ARCHIVE_NAME
diff --git a/pkgmngt/packageManager.xml.pacman b/pkgmngt/packageManager.xml.pacman
index b671595..aa4e9ce 100644
--- a/pkgmngt/packageManager.xml.pacman
+++ b/pkgmngt/packageManager.xml.pacman
@@ -497,8 +497,7 @@ CacheDir = /var/cache/pacman/pkg/
 LogFile  = /var/log/pacman.log
 SigLevel = Never
 # Repository: do not add one now: repo-add needs openssl.
-EOF
-chown tester:tester /var/lib/{packages,pacman}</userinput></screen>
+EOF</userinput></screen>
 
   </sect2>
 
@@ -550,11 +549,17 @@ following line -->
   <title>Creating Essential Files</title>
 
 <screen><userinput>if ! grep -q tester /etc/passwd; then
-    echo "tester:x:101:101::/home/tester:/bin/bash" >> /etc/passwd
-    echo "tester:x:101:" >> /etc/group
-    install -o tester -d /home/tester
+    echo "builder:x:101:101::/home/builder:/bin/bash" >> /etc/passwd
+    echo "builder:x:101:" >> /etc/group
+    install -o builder -d /home/builder
+else
+    TEST_UID=$(grep tester /etc/passwd | cut -d: -f3)
+    TEST_GID=$(grep tester /etc/group | cut -d: -f3)
+    echo "builder:x:$((TEST_UID+1)):$((TEST_GID+1))::/home/builder:/bin/bash" >> /etc/passwd
+    echo "builder:x:$((TEST_GID+1)):" >> /etc/group
+    install -o builder -d /home/builder
 fi
-chown tester:tester /var/lib/{packages,pacman}</userinput></screen>
+chown builder:builder /var/lib/{packages,pacman}</userinput></screen>
 
 </sect1>