diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..724bff929
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.pyc
+chocolate_protocol_pb2.py
+m3
diff --git a/client-webserver/.gitignore b/client-webserver/.gitignore
new file mode 100644
index 000000000..74be5f32c
--- /dev/null
+++ b/client-webserver/.gitignore
@@ -0,0 +1,2 @@
+choc_cert_extensions.cnf
+*.crt
diff --git a/server-ca/.gitignore b/server-ca/.gitignore
new file mode 100644
index 000000000..d5e817aa6
--- /dev/null
+++ b/server-ca/.gitignore
@@ -0,0 +1 @@
+SERVERNAME
diff --git a/server-ca/demoCA/.gitignore b/server-ca/demoCA/.gitignore
new file mode 100644
index 000000000..146ca06bc
--- /dev/null
+++ b/server-ca/demoCA/.gitignore
@@ -0,0 +1 @@
+newcerts
diff --git a/server-ca/sni_challenge/.gitignore b/server-ca/sni_challenge/.gitignore
new file mode 100644
index 000000000..83dcd30f4
--- /dev/null
+++ b/server-ca/sni_challenge/.gitignore
@@ -0,0 +1,5 @@
+_sni_support.so
+sni_support_wrap.c
+sni_support.py
+sni_support.o
+sni_support_wrap.o