diff --git a/.vimlocal b/.vimlocal
new file mode 100644
index 0000000..6b16e68
--- /dev/null
+++ b/.vimlocal
@@ -0,0 +1 @@
+map <silent> <F9> :Make<cr>
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..04a67a0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,15 @@
+BUILDDIR=.build
+
+all: $(BUILDDIR) $(BUILDDIR)/XED.COM
+
+$(BUILDDIR)/XED.COM: src/crt0.z80 src/* include/* lib/*
+	@zasm $< -y -o $@ -L lib -I ../tools/sdcc-code/sdcc/device/include
+
+$(BUILDDIR):
+	@mkdir $(BUILDDIR)
+
+.PHONE: clean
+
+clean:
+	@rm -rf $(BUILDDIR)/s
+	@rm -df $(BUILDDIR)/*.COM $(BUILDDIR)/*.lst .build
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 71c183d..0000000
--- a/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-rm -rf .build
-mkdir .build
-# zasm src/crt0.z80 -y -o .build/xed.com -L ../sdcc/device/lib
-zasm src/crt0.z80 -y -o .build/xed.com -L lib -I ../tools/sdcc-code/sdcc/device/include
diff --git a/upload.sh b/upload.sh
index d44024b..f0be0ae 100755
--- a/upload.sh
+++ b/upload.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-cd ../z80-cpm && ./build.py && sudo dd if=.build/disk.img of=/dev/sdb
+cd ../tools && ./create_img.py && sudo dd if=disk.img of=/dev/sdb