diff --git a/.gitignore b/.gitignore
index 164d3ef..ad4b0eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,14 @@
-*~
-*.swp
+# 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'
+
 *.pyc
 *.log
 .coverage
@@ -19,7 +28,5 @@ openstack/versioninfo
 *.egg
 openstack/common/db/*.sqlite
 .stestr/
-.project
-.pydevproject
 etc/openstack.conf.sample
 releasenotes/build