diff --git a/.gitignore b/.gitignore
index 2e2c30a..d2b65cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,29 @@
-/build/
-.stestr/
-.tox/
-ceilometer_powervm.egg-info/
-*.pyc
-doc/build
-AUTHORS
-ChangeLog
-/.idea/
+# Add patterns in here to exclude files created by tools integrated with this
+# repository, such as test frameworks from the project's recommended workflow,
+# rendered documentation and package builds.
+#
+# Don't add patterns to exclude files created by preferred personal tools
+# (editors, IDEs, your operating system itself even). These should instead be
+# maintained outside the repository, for example in a ~/.gitignore file added
+# with:
+#
+# git config --global core.excludesfile '~/.gitignore'
+
+# Bytecompiled Python
+*.py[cod]
+
+# Packages
+*.egg-info
+
+# Unit test / coverage reports
 .coverage
 cover/
+.stestr/
+.tox/
+
+# Sphinx
+doc/build/
+
+# pbr generates these
+AUTHORS
+ChangeLog