diff --git a/README.rst b/README.rst
index 704536932..1664bddde 100644
--- a/README.rst
+++ b/README.rst
@@ -1,3 +1,10 @@
+======
+pytest
+======
+
+The ``pytest`` testing tool makes it easy to write small tests, yet
+scales to support complex functional testing.
+
 .. image:: https://pypip.in/v/pytest/badge.png
    :target: https://pypi.python.org/pypi/pytest
 
@@ -5,12 +12,12 @@ Documentation: http://pytest.org/latest/
 
 Changelog: http://pytest.org/latest/changelog.html
 
-Issues: https://bitbucket.org/pytest-dev/pytest/issues?status=open
+Issues: https://github.com/pytest-dev/pytest/issues
 
 CI: https://drone.io/bitbucket.org/pytest-dev/pytest
 
-The ``pytest`` testing tool makes it easy to write small tests, yet
-scales to support complex functional testing.  It provides
+Features
+--------
 
 - `auto-discovery
   <http://pytest.org/latest/goodpractises.html#python-test-discovery>`_
@@ -27,7 +34,9 @@ scales to support complex functional testing.  It provides
 
 - many `external plugins <http://pytest.org/latest/plugins.html#installing-external-plugins-searching>`_.
 
-A simple example for a test::
+A simple example for a test:
+
+.. code-block:: python
 
     # content of test_module.py
     def test_function():
@@ -42,11 +51,11 @@ For much more info, including PDF docs, see
 
 and report bugs at:
 
-    http://bitbucket.org/pytest-dev/pytest/issues/
+    https://github.com/pytest-dev/pytest/issues
 
 and checkout or fork repo at:
 
-    http://bitbucket.org/pytest-dev/pytest/
+    https://github.com/pytest-dev/pytest
 
 
 Copyright Holger Krekel and others, 2004-2014
diff --git a/_pytest/python.py b/_pytest/python.py
index e0fb292c7..3acbf2eb2 100644
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1066,7 +1066,7 @@ def raises(ExpectedException, *args, **kwargs):
     if ExpectedException is AssertionError:
         # we want to catch a AssertionError
         # replace our subclass with the builtin one
-        # see https://bitbucket.org/pytest-dev/pytest/issue/176/pytestraises
+        # see https://github.com/pytest-dev/pytest/issues/176
         from _pytest.assertion.util import BuiltinAssertionError \
             as ExpectedException
     msg = ("exceptions must be old-style classes or"
diff --git a/doc/en/adopt.txt b/doc/en/adopt.txt
index 868f16b5d..aead96e7f 100644
--- a/doc/en/adopt.txt
+++ b/doc/en/adopt.txt
@@ -9,7 +9,7 @@ We will pair experienced pytest users with open source projects, for a month's e
 In 2015 we are trying this for the first time. In February and March 2015 we will gather volunteers on both sides, in April we will do the work, and in May we will evaluate how it went. This effort is being coordinated by Brianna Laugher. If you have any questions or comments, you can raise them on the `@pytestdotorg twitter account <https://twitter.com/pytestdotorg>`_ the `issue tracker`_ or the `pytest-dev mailing list`_.
 
 
-.. _`issue tracker`: https://bitbucket.org/pytest-dev/pytest/issue/676/adopt-pytest-month-2015
+.. _`issue tracker`: https://github.com/pytest-dev/pytest/issues/676
 .. _`pytest-dev mailing list`: https://mail.python.org/mailman/listinfo/pytest-dev
 
 
diff --git a/doc/en/contact.txt b/doc/en/contact.txt
index 6799ae0f7..d4a1a03de 100644
--- a/doc/en/contact.txt
+++ b/doc/en/contact.txt
@@ -29,7 +29,7 @@ Contact channels
 - `merlinux.eu`_ offers pytest and tox-related professional teaching and
   consulting.
 
-.. _`pytest issue tracker`: http://bitbucket.org/pytest-dev/pytest/issues/
+.. _`pytest issue tracker`: https://github.com/pytest-dev/pytest/issues
 .. _`old issue tracker`: http://bitbucket.org/hpk42/py-trunk/issues/
 
 .. _`merlinux.eu`: http://merlinux.eu
diff --git a/doc/en/nose.txt b/doc/en/nose.txt
index 7acef7900..3b92e04cf 100644
--- a/doc/en/nose.txt
+++ b/doc/en/nose.txt
@@ -39,13 +39,13 @@ Unsupported idioms / known issues
   it doesn't seem useful to duplicate the unittest-API like nose does.
   If you however rather think pytest should support the unittest-spelling on
   plain classes please post `to this issue
-  <https://bitbucket.org/pytest-dev/pytest/issue/377/>`_.
+  <https://github.com/pytest-dev/pytest/issues/377/>`_.
 
 - nose imports test modules with the same import path (e.g.
   ``tests.test_mod``) but different file system paths
   (e.g. ``tests/test_mode.py`` and ``other/tests/test_mode.py``)
   by extending sys.path/import semantics.   pytest does not do that
-  but there is discussion in `issue268 <https://bitbucket.org/pytest-dev/pytest/issue/268>`_ for adding some support.  Note that
+  but there is discussion in `issue268 <https://github.com/pytest-dev/pytest/issues/268>`_ for adding some support.  Note that
   `nose2 choose to avoid this sys.path/import hackery <https://nose2.readthedocs.org/en/latest/differences.html#test-discovery-and-loading>`_.
 
 - nose-style doctests are not collected and executed correctly,
diff --git a/doc/en/plugins.txt b/doc/en/plugins.txt
index 0e972bf0d..48160dafa 100644
--- a/doc/en/plugins.txt
+++ b/doc/en/plugins.txt
@@ -118,7 +118,7 @@ pytest default plugin reference
 
 
 You can find the source code for the following plugins
-in the `pytest repository <http://bitbucket.org/pytest-dev/pytest/>`_.
+in the `pytest repository <https://github.com/pytest-dev/pytest>`_.
 
 .. autosummary::
 
diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py
index b501b8609..690aee556 100644
--- a/testing/test_monkeypatch.py
+++ b/testing/test_monkeypatch.py
@@ -63,7 +63,7 @@ class TestSetattrWithImportPath:
                       lambda: monkeypatch.setattr("os.path.qweqwe", None))
 
     def test_unknown_attr_non_raising(self, monkeypatch):
-        # https://bitbucket.org/pytest-dev/pytest/issue/746/
+        # https://github.com/pytest-dev/pytest/issues/746
         monkeypatch.setattr('os.path.qweqwe', 42, raising=False)
         assert os.path.qweqwe == 42