diff --git a/.gitignore b/.gitignore
index 5431dbcc..a6e7b07c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,10 @@
+#Ignore build files
+Makefile
+config.h
+config.log
+config.status
+libtool
+stamp-h1
 output/
 win32port/ipch/
 win32port/Debug*/
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 00000000..dbed3ffb
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,8 @@
+#Ignore build files
+Makefile
+*.o
+*.lo
+*.la
+.libs
+.deps
+
diff --git a/test-server/.gitignore b/test-server/.gitignore
new file mode 100644
index 00000000..53ba6cb4
--- /dev/null
+++ b/test-server/.gitignore
@@ -0,0 +1,9 @@
+#Ignore build files
+libwebsockets-test-*
+Makefile
+*.o
+*.lo
+*.la
+.libs
+.deps
+