diff --git a/pylintrc b/pylintrc
index c5c800043..e486a2553 100644
--- a/pylintrc
+++ b/pylintrc
@@ -1,38 +1,61 @@
 [MESSAGES CONTROL]
-disable=abstract-class-little-used,
-        bad-builtin,
-        bad-classmethod-argument,
-        bad-continuation,
-        bad-mcs-classmethod-argument,
-        bad-mcs-method-argument,
-        broad-except,
-        deprecated-lambda,
-        empty-docstring,
-        fixme,
-        invalid-name,
-        line-too-long,
-        missing-docstring,
-        no-init,
-        no-member,
-        no-name-in-module,
-        no-self-argument,
-        no-self-use,
-        relative-import,
-        star-args,
-        super-init-not-called,
-        too-few-public-methods,
-        too-many-ancestors,
-        too-many-arguments,
-        too-many-branches,
-        too-many-instance-attributes,
-        too-many-lines,
-        too-many-locals,
-        too-many-public-methods,
-        too-many-return-statements,
-        too-many-statements,
-        wildcard-import,
-        E1102,
-        E1103
+disable=
+    # Rules that are unwanted, prone to false positives or a pain to fix.
+    abstract-method,
+    arguments-differ,
+    attribute-defined-outside-init,
+    bad-continuation,
+    broad-except,
+    cyclic-import,
+    duplicate-code,
+    fixme,
+    inconsistent-return-statements,
+    invalid-name,
+    line-too-long,
+    misplaced-comparison-constant,
+    missing-docstring,
+    no-else-return,
+    no-init,
+    no-member,
+    no-self-use,
+    not-an-iterable,
+    not-callable,
+    old-style-class,
+    protected-access,
+    redefined-argument-from-local,
+    redefined-builtin,
+    redefined-outer-name,
+    relative-import,
+    too-few-public-methods,
+    too-many-ancestors,
+    too-many-arguments,
+    too-many-branches,
+    too-many-instance-attributes,
+    too-many-lines,
+    too-many-locals,
+    too-many-public-methods,
+    too-many-return-statements,
+    too-many-statements,
+    unexpected-keyword-arg,
+    ungrouped-imports,
+    unsubscriptable-object,
+    unused-argument,
+    unused-wildcard-import,
+    wildcard-import,
+    wrong-import-order,
+
+    # Rules only enabled in --py3k mode
+    dict-keys-not-iterating,
+    dict-values-not-iterating,
+    eq-without-hash,
+    filter-builtin-not-iterating,
+    map-builtin-not-iterating,
+    no-absolute-import,
+    range-builtin-not-iterating,
+    round-builtin,
+    zip-builtin-not-iterating,
 
 [REPORTS]
-reports=no
+msg-template={path}:{line},{column}: {msg} ({msg_id}: {symbol})
+output-format=colorized
+score=n