diff --git a/.gitignore b/.gitignore
index bd558ebd..41758c3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ kernal_hybrid.rom
 
 # Compilation related files
 
-assembler/KickAss*
 build/*
 
 # Input to the similarity tool - copyrighted material, we can't check it in!
diff --git a/Makefile b/Makefile
index 8d4f2da4..02266937 100644
--- a/Makefile
+++ b/Makefile
@@ -80,7 +80,7 @@ all:
 	$(MAKE) -j64 --output-sync=target $(STD_TARGET_LIST) $(EXT_TARGET_LIST)
 
 clean:
-	@rm -rf build
+	@rm -rf build c64/basic/combined.s c64/kernal/combined.s
 
 updatebin:
 	$(MAKE) -j64 --output-sync=target $(STD_TARGET_LIST) $(TOOL_RELEASE)
diff --git a/assembler/KickAss.cfg b/assembler/KickAss.cfg
new file mode 100644
index 00000000..919ec309
--- /dev/null
+++ b/assembler/KickAss.cfg
@@ -0,0 +1,3 @@
+# These are the defaults - not needed for Open ROMs build system
+# -showmem
+# -symbolfile
diff --git a/assembler/KickAss.jar b/assembler/KickAss.jar
new file mode 100644
index 00000000..9eb0e2b4
Binary files /dev/null and b/assembler/KickAss.jar differ
diff --git a/assembler/KickAssembler.pdf b/assembler/KickAssembler.pdf
new file mode 100644
index 00000000..da4dab4e
Binary files /dev/null and b/assembler/KickAssembler.pdf differ
diff --git a/assembler/LICENSE b/assembler/LICENSE
new file mode 100644
index 00000000..618974a5
--- /dev/null
+++ b/assembler/LICENSE
@@ -0,0 +1,3 @@
+KickAssembler is NOT LGPL:
+
+http://theweb.dk/KickAssembler/Main.html#frontpage
diff --git a/assembler/README.TXT b/assembler/README.TXT
deleted file mode 100644
index 3bc6fa41..00000000
--- a/assembler/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-Put KickAss.jar and KickAss.cfg into this directory.