diff --git a/docs/index.md b/docs/index.md
index a96d0925b..75a1cf6e6 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -159,7 +159,7 @@ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=restframework2
+[travis]: http://travis-ci.org/tomchristie/django-rest-framework?branch=master
 [travis-build-image]: https://secure.travis-ci.org/tomchristie/django-rest-framework.png?branch=restframework2
 [urlobject]: https://github.com/zacharyvoase/urlobject
 [markdown]: http://pypi.python.org/pypi/Markdown/
diff --git a/mkdocs.py b/mkdocs.py
index 3f6c5f655..8106e8e22 100755
--- a/mkdocs.py
+++ b/mkdocs.py
@@ -18,7 +18,7 @@ if local:
     index = 'index.html'
 else:
     base_url = 'http://django-rest-framework.org'
-    suffix = ''
+    suffix = '.html'
     index = ''
 
 
diff --git a/setup.py b/setup.py
index 8ac2f03f5..26d072837 100755
--- a/setup.py
+++ b/setup.py
@@ -52,7 +52,7 @@ if sys.argv[-1] == 'publish':
 
 
 setup(
-    name='rest_framework',
+    name='djangorestframework',
     version=version,
     url='http://django-rest-framework.org',
     download_url='http://pypi.python.org/pypi/rest_framework/',