diff --git a/Makefile b/Makefile
index 78c28b6b..0881fe99 100644
--- a/Makefile
+++ b/Makefile
@@ -404,7 +404,7 @@ $(OBJ)/BootROMs/SameBoyLogo.pb12: $(OBJ)/BootROMs/SameBoyLogo.2bpp $(PB12_COMPRE
 	$(realpath $(PB12_COMPRESS)) < $< > $@
 	
 $(PB12_COMPRESS): BootROMs/pb12.c
-	$(NATIVE_CC) -std=c99 -Wall -Werror $< -o $@ --target=i386-pc-windows
+	$(NATIVE_CC) -std=c99 -Wall -Werror $< -o $@
 
 $(BIN)/BootROMs/agb_boot.bin: BootROMs/cgb_boot.asm
 $(BIN)/BootROMs/cgb_boot_fast.bin: BootROMs/cgb_boot.asm
diff --git a/build-faq.md b/build-faq.md
index 481d1b9e..56c59ae3 100644
--- a/build-faq.md
+++ b/build-faq.md
@@ -10,30 +10,22 @@ SameBoy on macOS expects you to have SDL2 installed via Brew, and not as a frame
 
 For the various tools and libraries, follow the below guide to ensure easy, proper configuration for the build environment:
 
-#### clang
-
-This may be installed via a Visual Studio installer packages instead of built from source.
-
 #### SDL Port
 
-[libsdl2](https://libsdl.org/download-2.0.php) has two separate files that must be downloaded
-  1. The `-x86` Runtime Binary (e.g., `SDL2-2.0.12-win32-x86.zip` (as of writing))
-  2. The Visual C++ Development Library (e.g., `SDL2-devel-2.0.12-VC.zip` (as of writing))
+For [libSDL2](https://libsdl.org/download-2.0.php), download the Visual C++ Development Library pack. Place the extracted files within a known folder for later. Both the `\x86\` and `\include\` paths will be needed.  
 
-For the Runtime Binary, place the extracted `SDL2.dll` into a known folder for later.
-
-- `C:\SDL2\bin\SDL2.dll` will be used as an example
-
-For the Visual C++ Development Library, place the extracted files within a known folder for later.
-
-The following examples will be referenced later:
+The following examples will be referenced later: 
 
 - `C:\SDL2\lib\x86\*`
 - `C:\SDL2\include\*`
 
-#### Gnuwin
+#### rgbds
 
-Ensure that this is in %PATH%.
+After downloading [rgbds](https://github.com/bentley/rgbds/releases/), ensure that it is added to the `%PATH%`. This may be done by adding it to the user's or SYSTEM's Environment Variables, or may be added to the command line at compilation time via `set path=%path%;C:\path\to\rgbds`.  
+
+#### GnuWin
+
+Ensure that the `gnuwin32\bin\` directory is included in `%PATH%`. Like rgbds above, this may instead be manually included on the command line before installation: `set path=%path%;C:\path\to\gnuwin32\bin`. 
 
 If errors arise (i.e., particularly with the `CREATE_PROCESS('usr/bin/mkdir')` calls, also verify that Git for Windows has not been installed with full Linux support. If it has, remove `C:\Program Files\Git\usr\bin` from the SYSTEM %PATH% until after compilation.
 
@@ -43,12 +35,11 @@ Within a command prompt in the project directory:
 
 ```
 vcvars32
-set path=%path%;C:\SDL2\bin
 set lib=%lib%;C:\SDL2\lib\x86
 set include=%include%;C:\SDL2\include
 make
 ```
-Please note that these directories (`C:\SDL2\*`) are the examples given within the "SDL Port" section above. Ensure that your `path`, `lib`, and `include` paths are updated appropriately with the SDL2 downloads.
+Please note that these directories (`C:\SDL2\*`) are the examples given within the "SDL Port" section above. Ensure that your `%PATH%` properly includes `rgbds` and `gnuwin32\bin`, and that the `lib` and `include` paths include the appropriate SDL2 directories.
 
 #### Error -1073741819