diff --git a/doc/source/faq.rst b/doc/source/faq.rst
index 6aa51346f008a..a613d53218ce2 100644
--- a/doc/source/faq.rst
+++ b/doc/source/faq.rst
@@ -65,28 +65,6 @@ Monkey-patching existing methods is usually a bad idea in that respect.
 When used with proper care, however, it's a very useful tool to have.
 
 
-.. _ref-python-startup:
-
-Setting startup options for pandas in python/ipython environment
-----------------------------------------------------------------
-
-Using startup scripts for the python/ipython environment to import pandas and set options makes working with pandas more efficient.  To do this, create a .py or .ipy script in the startup directory of the desired profile.  An example where the startup folder is in a default ipython profile can be found at:
-
-.. code-block:: python
-
-  $IPYTHONDIR/profile_default/startup
-
-More information can be found in the `ipython profile documentation
-<http://ipython.org/ipython-doc/1/config/overview.html>`__.  An example startup script for pandas is displayed below:
-
-.. code-block:: python
-
-  import pandas as pd
-  pd.set_option('display.max_rows', 999)
-  pd.set_option('precision', 5)
-
-For a list of options available for pandas, see the :ref:`pandas options documentation <options>`.
-
 .. _ref-scikits-migration:
 
 Migrating from scikits.timeseries to pandas >= 0.8.0
diff --git a/doc/source/options.rst b/doc/source/options.rst
index 420e4f20261ca..95a137fb96e66 100644
--- a/doc/source/options.rst
+++ b/doc/source/options.rst
@@ -124,6 +124,25 @@ are restored automatically when you exit the `with` block:
    print(pd.get_option("display.max_columns"))
 
 
+Setting Startup Options in python/ipython Environment
+-----------------------------------------------------
+
+Using startup scripts for the python/ipython environment to import pandas and set options makes working with pandas more efficient.  To do this, create a .py or .ipy script in the startup directory of the desired profile.  An example where the startup folder is in a default ipython profile can be found at:
+
+.. code-block:: python
+
+  $IPYTHONDIR/profile_default/startup
+
+More information can be found in the `ipython documentation
+<http://ipython.org/ipython-doc/stable/interactive/tutorial.html#startup-files>`__.  An example startup script for pandas is displayed below:
+
+.. code-block:: python
+
+  import pandas as pd
+  pd.set_option('display.max_rows', 999)
+  pd.set_option('precision', 5)
+
+
 Frequently Used Options
 -----------------------
 The following is a walkthrough of the more frequently used display options.