diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..7c41a47b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.o
+*.bz2
+
diff --git a/buildscripts/base_tools b/buildscripts/base_tools
index f0864823..d322ce3a 100644
--- a/buildscripts/base_tools
+++ b/buildscripts/base_tools
@@ -10,7 +10,7 @@ endif
 #---------------------------------------------------------------------------------
 # path to tools
 #---------------------------------------------------------------------------------
-export PATH	:=	$(DEVKITARM)/bin:$(PATH)
+export PATH	:=	$(DEVKITA64)/bin:$(PATH)
 
 #---------------------------------------------------------------------------------
 # the prefix on the compiler executables
diff --git a/crt0/Makefile b/crt0/Makefile
index 0cc5e8f8..fdd5fc3c 100644
--- a/crt0/Makefile
+++ b/crt0/Makefile
@@ -1,8 +1,8 @@
 switch_crt0.o: *.s
-	aarch64-none-elf-gcc -march=armv8-a -x assembler-with-cpp -c $^ -o $@
+	$(DEVKITA64)/bin/aarch64-none-elf-gcc -march=armv8-a -x assembler-with-cpp -c $^ -o $@
 
 install: switch_crt0.o
-	cp $^ $(DEVKITA64)/aarch64-none-elf/lib/$^
+	cp $^ $(DEVKITA64)/aarch64-none-elf/lib/pic/$^
 
 clean:
 	rm -f switch_crt0.o
diff --git a/nx/.gitignore b/nx/.gitignore
new file mode 100644
index 00000000..356ccb11
--- /dev/null
+++ b/nx/.gitignore
@@ -0,0 +1,4 @@
+debug
+release
+lib
+
diff --git a/tools/.gitignore b/tools/.gitignore
new file mode 100644
index 00000000..7b071a86
--- /dev/null
+++ b/tools/.gitignore
@@ -0,0 +1,2 @@
+build_pfs0
+elf2nso
diff --git a/tools/Makefile b/tools/Makefile
index 0479b49e..66745fd5 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,14 +1,14 @@
 all: elf2nso build_pfs0
 
 build_pfs0: build_pfs0.c
-	gcc -o $@ $^
+	gcc $(CFLAGS) -o $@ $^
 
 elf2nso: elf2nso.c sha256.c
-	gcc -o $@ $^ -llz4
+	gcc $(CFLAGS) -o $@ $^ -llz4
 
 install: all
-	cp build_pfs0 /usr/local/bin/
-	cp elf2nso /usr/local/bin/
+	cp build_pfs0 $(DEVKITA64)/bin/
+	cp elf2nso $(DEVKITA64)/bin/
 
 clean:
 	rm -f elf2nso