diff --git a/.gitignore b/.gitignore
index 5214e440..f34ba1f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,20 @@
 *.pyc
 *~
+etc/ec2api/ec2api.conf.sample
 .project
 .pydevproject
 ec2_api.egg-info
 .tox
+*.log
+*.egg
+*.swp
+*.swo
+build
+dist
 .testrepository
 /functional_tests.conf*
 /buckets
 .venv
+.coverage*
+!.coveragerc
+cover/