diff --git a/docs/README.adoc b/docs/README.adoc
index d7df21a..1b17d91 100644
--- a/docs/README.adoc
+++ b/docs/README.adoc
@@ -138,7 +138,7 @@ Configure your bootloader to add the following options as necessary:
 * If `aif_auth` is `digest`, this is the realm we would use (we attempt to "guess" if it isn’t specified); otherwise it is ignored.
 
 == Building a compatible LiveCD
-You have two options.
+The default Arch install CD does not have AIF installed (yet... ;). You have two options of using AIF-NG.
 
 === Recommended
 The recommended option is to use https://bdisk.square-r00t.net/[BDisk^] (the author should look familiar ;) and per https://bdisk.square-r00t.net/#advanced_customization[the documentation^], you would simply create the following modifications (remember to replace *<BDisk directory>* with your actual BDisk directory):
@@ -149,6 +149,7 @@ The recommended option is to use https://bdisk.square-r00t.net/[BDisk^] (the aut
 . `printf '[Unit]\nDescription=AIF-NG Client Service\nAfter=livecdfix.service\n\n[Service]\nType=oneshot\nExecStart=/usr/bin/aif\n\n[Install]\nWantedBy=multi-user.target\n' > *<BDisk directory>*/overlay/etc/systemd/system/aif.service`
 .. (NOTE: This is all one line.)
 .. (NOTE: We use a custom aif.service instead of the AUR package provided one because of how BDisk handles bringing up the network.)
+. `echo "aif-git" > *<BDisk directory>*/extra/pre-build.d/root/packages.both`
 . If you want automatic root login on TTY1 like the Arch install ISO (optional):
 .. `mkdir -p *<BDisk directory>*/overlay/etc/systemd/system/getty\@tty1.service.d`
 .. `printf '[Service]\nType=idle\nExecStart=\nExecStart=-/usr/bin/agetty --autologin root --noclear %%I 38400 linux\n' > *<BDisk directory>*/overlay/etc/systemd/system/getty\@tty1.service.d`
diff --git a/extras/bdisk.build.ini b/extras/bdisk.build.ini
new file mode 100644
index 0000000..8678ff9
--- /dev/null
+++ b/extras/bdisk.build.ini
@@ -0,0 +1,104 @@
+###########################################################
+##                BUILD.CONF SAMPLE FILE                 ##
+###########################################################
+#
+# This file is used to define various variables/settings
+# used by the build script.
+#
+# For full (perhaps overly-verbose ;) documentation, please
+# see:
+# https://bdisk.square-r00t.net/#_the_code_build_ini_code_file
+# Or simply refer to the section titled "The build.ini File"
+# in the user manual.
+
+[bdisk]
+name = AIF
+uxname = aif
+pname = AIF-NG
+ver = 0.02
+dev = r00t^2
+email = bts@square-r00t.net
+desc = See https://aif.square-r00t.net/
+uri = https://aif.square-r00t.net/
+root_password = BLANK
+user = no
+
+[user]
+username = ${bdisk:uxname}
+name = Default user
+password = BLANK
+
+[source_x86_64]
+mirror = mirror.us.leaseweb.net
+#mirrorproto = https
+mirrorproto = http
+mirrorpath = /archlinux/iso/latest/
+mirrorfile = 
+mirrorchksum = ${mirrorpath}sha1sums.txt
+chksumtype = sha1
+mirrorgpgsig = .sig
+gpgkey = 4AA4767BBC9C4B1D18AE28B77F2D434B9741E8AC
+gpgkeyserver =
+
+[source_i686]
+mirror = mirror.us.leaseweb.net
+#mirrorproto = https
+mirrorproto = http
+mirrorpath = /archlinux/iso/latest/
+mirrorfile = 
+mirrorchksum = ${mirrorpath}sha1sums.txt
+chksumtype = sha1
+mirrorgpgsig = .sig
+gpgkey = 7F2D434B9741E8AC
+gpgkeyserver =
+
+[build]
+gpg = yes
+dlpath = /var/tmp/${bdisk:uxname}
+chrootdir = /var/tmp/chroots
+basedir = /opt/dev/bdisk
+isodir = ${dlpath}/iso
+srcdir = ${dlpath}/src
+prepdir = ${dlpath}/temp
+archboot = ${prepdir}/${bdisk:name}
+mountpt = /mnt/${bdisk:uxname}
+multiarch = 64
+sign = yes
+ipxe = yes
+i_am_a_racecar = yes
+
+[gpg]
+mygpgkey = 748231EBCBD808A14F5E85D28C004C2F93481F6B
+mygpghome = /root/.gnupg
+
+[sync]
+http = yes
+tftp = yes
+git = no
+rsync = no
+
+[http]
+path = ${build:dlpath}/http
+user = root
+group = root
+
+[tftp]
+path = ${build:dlpath}/tftpboot
+user = root
+group = root
+
+[ipxe]
+iso = yes
+uri = https://aif.square-r00t.net/boot.ipxe
+ssldir = ${build:dlpath}/ssl
+ssl_ca = ${ssldir}/ca.crt
+ssl_cakey = ${ssldir}/ca.key
+ssl_crt = ${ssldir}/main.crt
+ssl_key = ${ssldir}/main.key
+
+[rsync]
+#host = 10.1.1.1
+host = bdisk.square-r00t.net
+user = root
+path = /srv/http/bdisk_ipxe
+iso = yes