diff --git a/README.md b/README.md
index a7302f03..505c4b3d 100644
--- a/README.md
+++ b/README.md
@@ -232,8 +232,7 @@ To make it easier for developers, you can run whipper straight from the
 source checkout:
 
 ```bash
-python2 setup.py develop --user
-whipper -h
+python2 -m whipper -h
 ```
 
 ## Logger plugins
diff --git a/whipper/__main__.py b/whipper/__main__.py
new file mode 100644
index 00000000..6a8e40b4
--- /dev/null
+++ b/whipper/__main__.py
@@ -0,0 +1,14 @@
+# -*- Mode: Python -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+import os
+import sys
+
+from whipper.command.main import main
+
+
+if __name__ == '__main__':
+    # Make accuraterip_checksum be found automatically if it was built
+    local_arb = os.path.join(os.path.dirname(__file__), '..', 'src')
+    os.environ['PATH'] = ':'.join([os.getenv('PATH'), local_arb])
+    sys.exit(main())