diff --git a/docs/quickstart.rst b/docs/quickstart.rst
index 429d7ab3..c5bb19d3 100644
--- a/docs/quickstart.rst
+++ b/docs/quickstart.rst
@@ -24,7 +24,10 @@ A minimal Flask application looks something like that::
         app.run()
 
 Just save it as `hello.py` or something similar and run it with your
-Python interpreter::
+Python interpreter.  Make sure to not call your application `flask.py`
+because this would conflict with Flask itself.
+
+::
 
     $ python hello.py
      * Running on http://localhost:5000/
diff --git a/setup.py b/setup.py
index c4aee59d..a0bddf4e 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ setup(
     author='Armin Ronacher',
     author_email='armin.ronacher@active-4.com',
     description='A microframework based on Werkzeug, Jinja2 and good intentions',
-    modules=['flask'],
+    py_modules=['flask'],
     zip_safe=False,
     platforms='any',
     install_requires=[