diff --git a/nix/pkgs/urbit/builder.sh b/nix/pkgs/urbit/builder.sh
index aa73e06ea9..3bd7155383 100644
--- a/nix/pkgs/urbit/builder.sh
+++ b/nix/pkgs/urbit/builder.sh
@@ -11,5 +11,5 @@ make all -j8
 make test
 
 mkdir -p $out/bin
-cp urbit $out/bin/$exename
-cp urbit-worker $out/bin/$exename-worker
+cp ./build/urbit $out/bin/$exename
+cp ./build/urbit-worker $out/bin/$exename-worker
diff --git a/nix/pkgs/urbit/release.sh b/nix/pkgs/urbit/release.sh
index e21dd63a74..76b35040a0 100644
--- a/nix/pkgs/urbit/release.sh
+++ b/nix/pkgs/urbit/release.sh
@@ -14,9 +14,9 @@ PKG_CONFIG=pkg-config-cross \
 HOST=$host                  \
 bash ./configure
 
-make urbit urbit-worker -j8
+make build/urbit build/urbit-worker -j8
 
 mkdir -p $out/bin
 cp -r $NCURSES/share/terminfo $out/bin/$exename-terminfo
-cp urbit                      $out/bin/$exename
-cp urbit-worker               $out/bin/$exename-worker
+cp ./build/urbit              $out/bin/$exename
+cp ./build/urbit-worker       $out/bin/$exename-worker
diff --git a/pkg/urbit/Makefile b/pkg/urbit/Makefile
index 798c728c88..f1606e4035 100644
--- a/pkg/urbit/Makefile
+++ b/pkg/urbit/Makefile
@@ -15,7 +15,8 @@ worker_objs = $(shell echo $(worker) | sed 's/\.c/.o/g')
 
 all_objs = $(common_objs) $(daemon_objs) $(worker_objs)
 all_srcs = $(common) $(daemon) $(worker)
-all_exes = ./mug_tests jam_tests ./hashtable_tests ./urbit ./urbit-worker
+all_exes = ./build/mug_tests ./build/jam_tests ./build/hashtable_tests \
+    ./build/urbit ./build/urbit-worker
 
 
 # -Werror promotes all warnings that are enabled into errors (this is on)
@@ -32,12 +33,12 @@ endif
 
 ################################################################################
 
-all: urbit urbit-worker hashtable_tests jam_tests mug_tests
+all: $(all_exes)
 
-test: hashtable_tests jam_tests mug_tests
-	./hashtable_tests
-	./jam_tests
-	./mug_tests
+test: build/hashtable_tests build/jam_tests build/mug_tests
+	./build/hashtable_tests
+	./build/jam_tests
+	./build/mug_tests
 
 clean:
 	rm -f ./tags $(all_objs) $(all_exes)
@@ -53,24 +54,29 @@ include/ca-bundle.h:
 	@xxd -i include/ca-bundle.crt > include/ca-bundle.h
 	@rm include/ca-bundle.crt
 
-hashtable_tests: $(common_objs) tests/hashtable_tests.o
+build/hashtable_tests: $(common_objs) tests/hashtable_tests.o
 	@echo CC -o $@
+	@mkdir -p ./build
 	@$(CC) $^ $(LDFLAGS) -o $@
 
-jam_tests: $(common_objs) tests/jam_tests.o
+build/jam_tests: $(common_objs) tests/jam_tests.o
 	@echo CC -o $@
+	@mkdir -p ./build
 	@$(CC) $^ $(LDFLAGS) -o $@
 
-mug_tests: $(common_objs) tests/mug_tests.o
+build/mug_tests: $(common_objs) tests/mug_tests.o
 	@echo CC -o $@
+	@mkdir -p ./build
 	@$(CC) $^ $(LDFLAGS) -o $@
 
-urbit: $(common_objs) $(daemon_objs)
+build/urbit: $(common_objs) $(daemon_objs)
 	@echo CC -o $@
+	@mkdir -p ./build
 	@$(CC) $^ $(LDFLAGS) -o $@
 
-urbit-worker: $(common_objs) $(worker_objs)
+build/urbit-worker: $(common_objs) $(worker_objs)
 	@echo CC -o $@
+	@mkdir -p ./build
 	@$(CC) $^ $(LDFLAGS) -o $@
 
 %.o: %.c $(headers)