diff --git a/Makefile b/Makefile
index d825ee5..504bb99 100644
--- a/Makefile
+++ b/Makefile
@@ -77,7 +77,7 @@ load: all
 	bootloadHID grbl.hex
 
 clean:
-	rm -f grbl.hex $(BUILDDIR)/*
+	rm -f grbl.hex $(BUILDDIR)/*.o $(BUILDDIR)/*.d $(BUILDDIR)/*.elf
 
 # file targets:
 $(BUILDDIR)/main.elf: $(OBJECTS)
diff --git a/build/.gitignore b/build/.gitignore
new file mode 100644
index 0000000..86d0cb2
--- /dev/null
+++ b/build/.gitignore
@@ -0,0 +1,4 @@
+# Ignore everything in this directory
+*
+# Except this file
+!.gitignore
\ No newline at end of file