diff --git a/Makefile b/Makefile
index 20b037e..7ade511 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
 SYS=$(shell uname -s)
 ARCH=$(shell uname -m)
 
-ASFLAGS += -Isrc
+ASFLAGS += -Isrc -Isrc/${ARCH}
 
 SRC=\
 	src/comments.ns\
diff --git a/src/x86_64/FreeBSD.s b/src/x86_64/FreeBSD.s
index 6b63db5..771c89b 100644
--- a/src/x86_64/FreeBSD.s
+++ b/src/x86_64/FreeBSD.s
@@ -5,21 +5,23 @@
 errnoaddr = __error
 
 .text
-.include "boot.s"
-.include "sysv.s"
+.include "x86_64/boot.s"
+.include "x86_64/sysv.s"
 
 .data
 .include "dicts.s"
 
 _kernbuf:
 .incbin "comments.ns"
-.incbin "arch.ns"
+.incbin "x86_64/arch.ns"
 .incbin "flowcontrol.ns"
 .incbin "interactive.ns"
 .incbin "dictionary.ns"
 .incbin "memory.ns"
 .incbin "string.ns"
 .incbin "pictured.ns"
+.incbin "abort.ns"
+.incbin "x86_64/signals.ns"
 .incbin "interpreter.ns"
 .incbin "file.ns"
 .incbin "shell.ns"