diff --git a/.gitignore b/.gitignore
index 5089545ffb..d93422bdce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,4 @@ pep8.txt
 .vagrant*
 .tox
 nohup.out
+reports
diff --git a/requirements/astroid-5ed6266.tar.gz b/requirements/astroid-5ed6266.tar.gz
new file mode 100644
index 0000000000..16e3a8fa04
Binary files /dev/null and b/requirements/astroid-5ed6266.tar.gz differ
diff --git a/requirements/dev.txt b/requirements/dev.txt
index 43d220e7d9..a37534554d 100644
--- a/requirements/dev.txt
+++ b/requirements/dev.txt
@@ -26,6 +26,7 @@ Django>=1.4
 django-debug-toolbar
 django-devserver
 unittest2
+-e hg+https://bitbucket.org/logilab/astroid/@5ed6266#egg=astroid
 django-jenkins
 ipython
 
diff --git a/requirements/dev_local.txt b/requirements/dev_local.txt
index ba823d938b..42c550b8b6 100644
--- a/requirements/dev_local.txt
+++ b/requirements/dev_local.txt
@@ -73,9 +73,9 @@ django-debug-toolbar-0.9.4.tar.gz
 django-devserver-0.6.2.tar.gz
 # Needed for Python2.6 support:
 unittest2-0.5.1.tar.gz
-# Needed by pylint:
+# Needed by pylint (use tip of astroid instead of 1.0.0):
 logilab-common-0.60.0.tar.gz
-astroid-1.0.0.tar.gz
+-U astroid-5ed6266.tar.gz
 # Needed by django-jenkins:
 coverage-3.6.tar.gz
 pylint-1.0.0.tar.gz