diff --git a/.gitignore b/.gitignore
index efc15f2..8a60b89 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,14 @@
 *.o.cmd
 .*.cmd
 *.g
+\#*
+.\#*
+*~
 
-# generated header
-usr/include/klibc/havesyscall.h
+# Top-level ignorables
+/linux
+/.config
+
+# Common generated subdirectores
+shared
+static
diff --git a/usr/include/klibc/.gitignore b/usr/include/klibc/.gitignore
new file mode 100644
index 0000000..da63bd6
--- /dev/null
+++ b/usr/include/klibc/.gitignore
@@ -0,0 +1,2 @@
+# generated header
+/havesyscall.h
diff --git a/usr/klibc/.gitignore b/usr/klibc/.gitignore
index 7cb400a..a886b6d 100644
--- a/usr/klibc/.gitignore
+++ b/usr/klibc/.gitignore
@@ -7,3 +7,5 @@
 libc.so
 libc.so.hash
 sha1hash
+tests/*
+!tests/Kbuild