diff --git a/.travis.yml b/.travis.yml
index df1e7e16579..b3d7f5dd538 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,13 @@ language: python
 python:
  - "2.7"
 install:
+<<<<<<< HEAD
  - pip install flake8 stripe
  - pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r requirements/pip.txt
+=======
+ - pip install flake8
+ - pip install --allow-all-external --allow-unverified bzr --allow-unverified launchpadlib --allow-unverified lazr.authentication -r requirements.txt
+>>>>>>> Added top-level requirements file
  - pip install coveralls
 script:
  #- flake8 `find . -iname "*.py" -not -ipath "*migration*"`
diff --git a/MANIFEST.in b/MANIFEST.in
index 70c596255e6..047d86fac0d 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -4,6 +4,7 @@ include README.rst
 include CHANGES
 include LICENSE.mit
 include MANIFEST.in
+include requirements.txt
 recursive-include requirements *.txt
 recursive-include docs *
 recursive-include readthedocs *
diff --git a/docs/install.rst b/docs/install.rst
index 88518ad7a5c..65215f6a103 100644
--- a/docs/install.rst
+++ b/docs/install.rst
@@ -41,7 +41,7 @@ Create a folder in here, and clone the repository::
 Next, install the dependencies using ``pip`` (included with virtualenv_)::
 
     cd readthedocs.org
-    pip install -r requirements/pip.txt
+    pip install -r requirements.txt
 
 .. note::
 
@@ -51,12 +51,12 @@ Next, install the dependencies using ``pip`` (included with virtualenv_)::
 
         CFLAGS=-I/usr/local/opt/libxml2/include/libxml2 \
         LDFLAGS=-L/usr/local/opt/libxml2/lib \
-        pip install -r requirements/pip.txt
+        pip install -r requirements.txt
 
 .. note::
 
     Linux users may find they need to install a few additional packages
-    in order to successfully execute ``pip-install -r requirements/pip.txt``.
+    in order to successfully execute ``pip-install -r requirements.txt``.
     For example, a clean install of Ubuntu 14.04 LTS will require the
     following packages::
 
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 00000000000..c70617e8e16
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,2 @@
+-r requirements/pip.txt
+# just referencing for a natural `pip install -r requirements.txt`