diff --git a/.gitignore b/.gitignore
index 72401dc..dc9b17e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,49 +1,25 @@
-*.py[co]
-*.egg[s]
 *.egg-info
-dist
-build
-eggs
-parts
-var
-sdist
-develop-eggs
-.installed.cfg
-pip-log.txt
+*.egg[s]
+*.log
+*.py[co]
 .coverage
+.testrepository
 .tox
-*.mo
-.mr.developer.cfg
-.DS_Store
-Thumbs.db
 .venv
-.idea
-out
-target
-*.iml
-*.ipr
-*.iws
-doc/html
-doc/source/apidoc
-doc/source/api
+AUTHORS
+ChangeLog
+build
+cover
+develop-eggs
+dist
 doc/build
-*.db
-nosetests.xml
-pylint-report.txt
-etc/local.cfg
+doc/html
+eggs
+etc/sahara.conf
 etc/sahara/*.conf
 etc/sahara/*.topology
-etc/sahara.conf
-ChangeLog
 sahara/tests/integration/configs/itest.conf
-cscope.out
+sdist
+target
 tools/lintstack.head.py
 tools/pylint_exceptions
-sahara/tests/cover
-sahara/tests/coverage.xml
-cover
-htmlcov
-sahara/openstack/common/db/sahara.sqlite
-.testrepository
-AUTHORS
-*.log