diff --git a/CHANGES.rst b/CHANGES.rst
index 0079324..2447cc5 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -6,6 +6,7 @@ CHANGES
 
 - New option ``doctests`` to run Pyflakes checks on doctests too
 - New option ``jobs`` to launch multiple jobs in parallel
+- Add support for ``python -m flake8`` on Python 2.7 and Python 3
 - Fix Git and Mercurial hooks: issues #88, #133, #148 and #149
 - Fix crashes with Python 3.4 by upgrading dependencies
 - Fix traceback when running tests with Python 2.6
diff --git a/flake8/__main__.py b/flake8/__main__.py
new file mode 100644
index 0000000..aaa497b
--- /dev/null
+++ b/flake8/__main__.py
@@ -0,0 +1,4 @@
+from flake8.main import main
+
+# python -m flake8 (with Python >= 2.7)
+main()