diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..07374ec89
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+CMakeCache.txt
+CMakeFiles
+CTestTestfile.cmake
+cmake_install.cmake
+Testing
diff --git a/include/.gitignore b/include/.gitignore
new file mode 100644
index 000000000..f3c7a7c5d
--- /dev/null
+++ b/include/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/programs/.gitignore b/programs/.gitignore
index 8fbc2d56b..d6d9efcf6 100644
--- a/programs/.gitignore
+++ b/programs/.gitignore
@@ -1,3 +1,4 @@
+*/Makefile
 aes/aescrypt2
 aes/crypt_and_hash
 hash/generic_sum
@@ -28,6 +29,7 @@ ssl/ssl_mail_client
 ssl/ssl_server
 ssl/ssl_server2
 test/benchmark
+test/o_p_test
 test/selftest
 test/ssl_cert_test
 test/ssl_test