diff --git a/examples/blueprintexample/blueprintexample.py b/examples/blueprintexample/blueprintexample.py
index bc0e41d455..925f484544 100644
--- a/examples/blueprintexample/blueprintexample.py
+++ b/examples/blueprintexample/blueprintexample.py
@@ -4,8 +4,4 @@
 app = Flask(__name__)
 app.register_blueprint(simple_page)
 # Blueprint can be registered many times
-app.register_blueprint(simple_page, url_prefix='/pages') 
-
-
-if __name__ == '__main__':
-    app.run(debug=True)
\ No newline at end of file
+app.register_blueprint(simple_page, url_prefix='/pages')
diff --git a/examples/flaskr/README b/examples/flaskr/README
index 9b5b9215c7..fc5553884b 100644
--- a/examples/flaskr/README
+++ b/examples/flaskr/README
@@ -13,9 +13,16 @@
          export an FLASKR_SETTINGS environment variable
          pointing to a configuration file.
 
-      2. now you can run the flaskr.py file with your
-         python interpreter and the application will
-         greet you on http://localhost:5000/
+      2. initialize the database with this command:
+
+         flask --app=flaskr initdb
+
+      3. now you can run flaskr:
+
+         flask --app=flaskr run
+
+         the application will greet you on
+         http://localhost:5000/
 	
     ~ Is it tested?
 
diff --git a/examples/jqueryexample/jqueryexample.py b/examples/jqueryexample/jqueryexample.py
index 08164119bd..034cc49559 100644
--- a/examples/jqueryexample/jqueryexample.py
+++ b/examples/jqueryexample/jqueryexample.py
@@ -23,7 +23,3 @@ def add_numbers():
 @app.route('/')
 def index():
     return render_template('index.html')
-
-
-if __name__ == '__main__':
-    app.run()
diff --git a/examples/minitwit/README b/examples/minitwit/README
index ab94629530..873ceb8e2f 100644
--- a/examples/minitwit/README
+++ b/examples/minitwit/README
@@ -14,13 +14,16 @@
          export an MINITWIT_SETTINGS environment variable
          pointing to a configuration file.
 
-      2. fire up a python shell and run this:
+      2. fire up a shell and run this:
 
-         >>> from minitwit import init_db; init_db()
+         flask --app=minitwit initdb
 
-      3. now you can run the minitwit.py file with your
-         python interpreter and the application will
-         greet you on http://localhost:5000/
+      3. now you can run minitwit:
+
+         flask --app=minitwit run
+
+         the application will greet you on
+         http://localhost:5000/
 	
     ~ Is it tested?
 
diff --git a/examples/minitwit/minitwit.py b/examples/minitwit/minitwit.py
index 913d452230..0a85247b84 100644
--- a/examples/minitwit/minitwit.py
+++ b/examples/minitwit/minitwit.py
@@ -49,13 +49,13 @@ def close_database(exception):
         top.sqlite_db.close()
 
 
-def init_db():
+@app.cli.command()
+def initdb():
     """Creates the database tables."""
-    with app.app_context():
-        db = get_db()
-        with app.open_resource('schema.sql', mode='r') as f:
-            db.cursor().executescript(f.read())
-        db.commit()
+    db = get_db()
+    with app.open_resource('schema.sql', mode='r') as f:
+        db.cursor().executescript(f.read())
+    db.commit()
 
 
 def query_db(query, args=(), one=False):
@@ -217,7 +217,7 @@ def register():
         if not request.form['username']:
             error = 'You have to enter a username'
         elif not request.form['email'] or \
-                 '@' not in request.form['email']:
+                '@' not in request.form['email']:
             error = 'You have to enter a valid email address'
         elif not request.form['password']:
             error = 'You have to enter a password'
@@ -248,8 +248,3 @@ def logout():
 # add some filters to jinja
 app.jinja_env.filters['datetimeformat'] = format_datetime
 app.jinja_env.filters['gravatar'] = gravatar_url
-
-
-if __name__ == '__main__':
-    init_db()
-    app.run()
diff --git a/examples/persona/persona.py b/examples/persona/persona.py
index d56f299af9..7374c3af67 100644
--- a/examples/persona/persona.py
+++ b/examples/persona/persona.py
@@ -53,7 +53,3 @@ def logout_handler():
     """
     session.clear()
     return 'OK'
-
-
-if __name__ == '__main__':
-    app.run()