diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..86ad7ba
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,36 @@
+# local files
+bios
+8086tiny
+
+# Object files
+*.o
+*.ko
+*.obj
+*.elf
+
+# Precompiled Headers
+*.gch
+*.pch
+
+# Libraries
+*.lib
+*.a
+*.la
+*.lo
+
+# Shared objects (inc. Windows DLLs)
+*.dll
+*.so
+*.so.*
+*.dylib
+
+# Executables
+*.exe
+*.out
+*.app
+*.i*86
+*.x86_64
+*.hex
+
+# Debug files
+*.dSYM/
diff --git a/Makefile b/Makefile
index e976817..f791cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,15 @@
 # 8086tiny builds with graphics and sound support
 # 8086tiny_slowcpu improves graphics performance on slow platforms (e.g. Raspberry Pi)
 # no_graphics compiles without SDL graphics/sound
-
+NASM=nasm 
 OPTS_ALL=-O3 -fsigned-char -std=c99
 OPTS_SDL=`sdl-config --cflags --libs`
 OPTS_NOGFX=-DNO_GRAPHICS
 OPTS_SLOWCPU=-DGRAPHICS_UPDATE_DELAY=25000
+NASM_FLAGS=-f bin  
+
+all: 8086tiny bios
+
 
 8086tiny: 8086tiny.c
 	${CC} 8086tiny.c ${OPTS_SDL} ${OPTS_ALL} -o 8086tiny
@@ -24,5 +28,9 @@ no_graphics: 8086tiny.c
 	${CC} 8086tiny.c ${OPTS_NOGFX} ${OPTS_ALL} -o 8086tiny
 	strip 8086tiny
 
+bios: bios_source/bios.asm
+	${NASM} ${NASM_FLAGS} bios_source/bios.asm -o bios
+
+.PHONY: clean	
 clean:
-	rm 8086tiny
+	rm 8086tiny bios
diff --git a/bios b/bios
deleted file mode 100644
index 2d2ffe3..0000000
Binary files a/bios and /dev/null differ
diff --git a/runme b/runme.sh
similarity index 100%
rename from runme
rename to runme.sh