diff --git a/.gitignore b/.gitignore
index 2f62d09..59d3541 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,22 +1,14 @@
-*.cmd
-*.ko
+# Extensions and prefixes.
 *.log
-*.mod.c
-*.o
-*.out
 *.tmp
 *~
-.tmp_versions
-/br2_cli
-/br2_local
-/ignore.sh
-/rootfs_overlay/etc/init.d/S99
-/rootfs_overlay/ignore.sh
+?*.gitignore
+gitignore*
+
+# Specific files.
 /9p
-Module.symvers
-README.html
-modules.order
-trace*
+/README.html
+/trace*
 
 # GEM5
 /m5out
diff --git a/README.adoc b/README.adoc
index 76e93de..53b7087 100644
--- a/README.adoc
+++ b/README.adoc
@@ -914,8 +914,8 @@ If the script is large, you can add it to a gitignored file and pass that to `-E
 echo '
 insmod /hello.ko
 /poweroff.out
-' > ignore.sh
-./run -E "$(cat ignore.sh)" -n
+' > gitignore.sh
+./run -E "$(cat gitignore.sh)" -n
 ....
 
 or add it to a file to the root filesystem guest and rebuild:
@@ -924,10 +924,10 @@ or add it to a file to the root filesystem guest and rebuild:
 echo '#!/bin/sh
 insmod /hello.ko
 /poweroff.out
-' > rootfs_overlay/ignore.sh
-chmod +x rootfs_overlay/ignore.sh
+' > rootfs_overlay/gitignore.sh
+chmod +x rootfs_overlay/gitignore.sh
 ./build
-./run -e 'init=/ignore.sh' -n
+./run -e 'init=/gitignore.sh' -n
 ....
 
 Remember that if your init returns, the kernel will panic, there are just two non-panic possibilities:
@@ -968,16 +968,14 @@ The `lkmc_eval` option gets evaled by our default `S98` startup script if presen
 Alternatively, add them to a new `init.d` entry to run at the end o the BusyBox init:
 
 ....
-cp rootfs_overlay/etc/init.d/S98 rootfs_overlay/etc/init.d/S99
-vim S99
+cp rootfs_overlay/etc/init.d/S98 rootfs_overlay/etc/init.d/S99.gitignore
+vim rootfs_overlay/etc/init.d/S99.gitignore
 ./build
 ./run
 ....
 
 and they will be run automatically before the login prompt.
 
-`S99` is a git tracked convenience symlink to the gitignored `rootfs_overlay/etc/init.d/S99`
-
 Scripts under `/etc/init.d` are run by `/etc/init.d/rcS`, which gets called by the line `::sysinit:/etc/init.d/rcS` in `/etc/inittab`.
 
 === Path to init
@@ -2209,9 +2207,9 @@ External open source benchmarks. We will try to create Buildroot packages for th
 Buildroot supports it, which makes everything just trivial:
 
 ....
-printf 'BR2_PACKAGE_OPENBLAS=y\n' >> br2_local
-printf 'BR2_TARGET_ROOTFS_EXT2_SIZE="128M"\n' >> br2_local
-./build -a arm -g -b br2_local -- kernel_module-reconfigure
+printf 'BR2_PACKAGE_OPENBLAS=y\n' >> br2.gitignore
+printf 'BR2_TARGET_ROOTFS_EXT2_SIZE="128M"\n' >> br2.gitignore
+./build -a arm -g -b br2.gitignore -- kernel_module-reconfigure
 ....
 
 and then inside the guest run our test program:
@@ -2223,7 +2221,7 @@ and then inside the guest run our test program:
 For x86, you also need:
 
 ....
-printf 'BR2_PACKAGE_OPENBLAS_TARGET="NEHALEM"\n' >> br2_local
+printf 'BR2_PACKAGE_OPENBLAS_TARGET="NEHALEM"\n' >> br2.gitignore
 ....
 
 to overcome this bug: https://bugs.busybox.net/show_bug.cgi?id=10856
@@ -2794,12 +2792,10 @@ dmesg
 
 We provide the following mechanisms:
 
-* `./build -b br2_local`: append the file `br2_local` to a single build. Must be passed every time you run `./build`.
-+
-For convenience, we already gitignore `br2_local` for you. A template is provided by:
+* `./build -b br2.gitignore`: append the file `br2.gitignore` to a single build. Must be passed every time you run `./build`.
 +
 ....
-cp br2_local.example br2_local
+cp br2.gitignore.example br2.gitignore
 ....
 +
 * `./build -c 'BR2_SOM_OPTION="myval"'`: append a single option to a single build.
diff --git a/S99 b/S99
deleted file mode 120000
index 4a81793..0000000
--- a/S99
+++ /dev/null
@@ -1 +0,0 @@
-rootfs_overlay/etc/init.d/S99
\ No newline at end of file
diff --git a/br2_local.example b/br2.gitignore.example
similarity index 100%
rename from br2_local.example
rename to br2.gitignore.example
diff --git a/build b/build
index 189c4d6..7ad5e45 100755
--- a/build
+++ b/build
@@ -3,8 +3,8 @@ set -eu
 help_text='
 '
 arch=x86_64
-rm -f br2_cli
-touch br2_cli
+rm -f br2_cli.gitignore
+touch br2_cli.gitignore
 configure=true
 config_fragments='br2'
 extra_make_args=''
@@ -23,7 +23,7 @@ while getopts 'a:b:c:Cgj:IiK:klp:qSv' OPT; do
       config_fragments="$config_fragments $OPTARG"
     ;;
     c)
-      echo "$OPTARG" >> br2_cli
+      echo "$OPTARG" >> br2_cli.gitignore
     ;;
     C)
       configure=false
@@ -36,17 +36,17 @@ while getopts 'a:b:c:Cgj:IiK:klp:qSv' OPT; do
 BR2_TARGET_ROOTFS_CPIO=n
 BR2_TARGET_ROOTFS_EXT2=n
 BR2_TARGET_ROOTFS_INITRAMFS=y
-" >> br2_cli
+" >> br2_cli.gitignore
     ;;
     i)
       echo "
 BR2_TARGET_ROOTFS_CPIO=y
 BR2_TARGET_ROOTFS_EXT2=n
 BR2_TARGET_ROOTFS_INITRAMFS=n
-" >> br2_cli
+" >> br2_cli.gitignore
     ;;
     j)
-      echo "$OPTARG" >> br2_cli
+      echo "$OPTARG" >> br2_cli.gitignore
     ;;
     k)
       extra_make_args="$extra_make_args kernel_module-reconfigure"
@@ -99,7 +99,7 @@ root_dir="$(pwd)"
 buildroot_dir="${root_dir}/buildroot"
 out_dir="${buildroot_dir}/output.${arch_dir}~"
 config_file="${out_dir}/.config"
-config_fragments="$config_fragments br2_cli"
+config_fragments="$config_fragments br2_cli.gitignore"
 
 if "$configure"; then
   cd "${buildroot_dir}"