diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..072e203
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,17 @@
+
+# Auto-generated
+.*.swp
+*.pyc
+__pycache__/
+.tox
+
+# shared libs installed by 'setup.py test'
+/Lib/*.so*
+/Lib/*.dylib
+/Lib/*.pyd
+
+# Build related
+*.egg-info
+build/
+dist/
+PKG-INFO
diff --git a/CHANGES b/CHANGES
index 92b4737..a8ad44a 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,9 @@ Mandatory prerequisites:
 - Python 2.7.x
 - pyasn1 0.3.7+ and pyasn1_modules 0.1.5+
 
+Infrastructure:
+- Add .gitignore
+
 Modules/
 (thanks to Michael Ströder)
 * removed unused code schema.c