diff --git a/docs/faq/index.txt b/docs/faq/index.txt
index 347cabaabc..b7281946ee 100644
--- a/docs/faq/index.txt
+++ b/docs/faq/index.txt
@@ -11,4 +11,5 @@ Django FAQ
    help
    models
    admin
-   contributing
\ No newline at end of file
+   contributing
+   troubleshooting
\ No newline at end of file
diff --git a/docs/faq/troubleshooting.txt b/docs/faq/troubleshooting.txt
new file mode 100644
index 0000000000..f984be4bf5
--- /dev/null
+++ b/docs/faq/troubleshooting.txt
@@ -0,0 +1,16 @@
+===============
+Troubleshooting
+===============
+
+This page contains some advice about errors and problems commonly encountered
+during the development of Django applications.
+
+"command not found: django-admin.py"
+------------------------------------
+
+:doc:`django-admin.py </ref/django-admin>` should be on your system path if you
+installed Django via ``python setup.py``. If it's not on your path, you can
+find it in ``site-packages/django/bin``, where ``site-packages`` is a directory
+within your Python installation. Consider symlinking to :doc:`django-admin.py
+</ref/django-admin>` from some place on your path, such as
+:file:`/usr/local/bin`.
\ No newline at end of file
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 250c0f1f41..1e2231d1e0 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -52,7 +52,8 @@ code, then run the following command:
 
    django-admin.py startproject mysite
 
-This will create a ``mysite`` directory in your current directory.
+This will create a ``mysite`` directory in your current directory.  If it didn't 
+work, see :doc:`Troubleshooting </faq/troubleshooting>`.
 
 .. admonition:: Script name may differ in distribution packages
 
@@ -78,13 +79,6 @@ This will create a ``mysite`` directory in your current directory.
     ``django`` (which will conflict with Django itself) or ``test`` (which
     conflicts with a built-in Python package).
 
-:doc:`django-admin.py </ref/django-admin>` should be on your system path if you
-installed Django via ``python setup.py``. If it's not on your path, you can find
-it in ``site-packages/django/bin``, where ``site-packages`` is a directory
-within your Python installation. Consider symlinking to :doc:`django-admin.py
-</ref/django-admin>` from some place on your path, such as
-:file:`/usr/local/bin`.
-
 .. admonition:: Where should this code live?
 
     If your background is in PHP, you're probably used to putting code under the