diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c32ede3
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+BUILDDIR=.build
+_BIN= fib.bin
+BIN = $(patsubst %,$(BUILDDIR)/%,$(_BIN))
+
+$(BUILDDIR)/%.bin: src/%.z80
+	@zasm -w -i $< -o $@
+
+$(BUILDDIR):
+	@mkdir $(BUILDDIR)
+
+all: $(BUILDDIR) $(BIN)
+
+.PHONE: clean
+
+clean:
+	@rm -df $(BUILDDIR)/*.bin $(BUILDDIR)/*.lst .build
diff --git a/build.sh b/build.sh
deleted file mode 100755
index de1f5be..0000000
--- a/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-mkdir -p .build && zasm -i src/fib.z80 -o .build/fib.bin
-ls -al .build/fib.bin
diff --git a/upload.py b/upload.py
deleted file mode 100755
index b95d218..0000000
--- a/upload.py
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/usr/bin/env python3
-import serial
-import os
-import sys
-import time
-
-def progressbar(it, prefix="", size=60, file=sys.stdout):
-    count = len(it)
-    def show(j):
-        x = int(size*j/count)
-        file.write("%s[%s%s] %i/%i\r" % (prefix, "#"*x, "."*(size-x), j, count))
-        file.flush()        
-    show(0)
-    for i, item in enumerate(it):
-        yield item
-        show(i+1)
-    file.write("\n")
-    file.flush()
-
-def main():
-    if len(sys.argv) == 2:
-        # ser = serial.Serial("COM3", timeout=1, write_timeout=1)
-        ser = serial.Serial("/dev/ttyUSB0", timeout=1, write_timeout=1, baudrate=115200)
-        if ser.is_open:
-            path = sys.argv[1]
-            size = os.path.getsize(path)
-
-            with open(path, "rb") as f:
-                for i in progressbar(range(size), "Upload: ", 40):
-                    byte = f.read(1)
-                    ser.write(byte)
-
-                    if byte == b'#':
-                        ser.write(b'#\n')
-
-                    time.sleep(0.002)
-
-            print(ser.readline())
-            ser.close()
-
-        else:
-            print("Failed to open serial port")
-    else:
-        print("Please provide file to upload")
-
-if "__main__":
-    main()