diff --git a/README.rst b/README.rst
--- a/README.rst
+++ b/README.rst
@@ -95,8 +95,8 @@ installation) and then enable it in ``~/
 To install using source clone, install keyring_ according to the
 instructions above, then clone::
     
-    hg clone https://bitbucket.org/Mekk/mercurial_keyring/
-    hg clone https://bitbucket.org/Mekk/mercurial-extension_utils/
+    hg clone https://foss.heptapod.net/mercurial/mercurial_keyring/
+    hg clone https://foss.heptapod.net/mercurial/mercurial-extension_utils/
 
 and configure Mercurial using  full path to the extension module::
 
@@ -104,7 +104,7 @@ and configure Mercurial using  full path
     mercurial_keyring = /path/to/mercurial_keyring/mercurial_keyring.py
 
 .. _the code: 
-.. _mercurial_keyring.py: http://bitbucket.org/Mekk/mercurial_keyring/src/tip/mercurial_keyring.py
+.. _mercurial_keyring.py: https://foss.heptapod.net/mercurial/mercurial_keyring/src/tip/mercurial_keyring.py
 
 Password backend configuration
 =======================================================
@@ -274,7 +274,7 @@ password(s) are saved. It can be used in
 
 - finally, any path can be checked::
 
-    hg keyring_check https://bitbucket.org/Mekk/mercurial_keyring
+    hg keyring_check https://foss.heptapod.net/mercurial/mercurial_keyring
 
 Deleting saved password (``hg keyring_clear``)
 -------------------------------------------------------
@@ -288,7 +288,7 @@ path. It can be used in two ways:
 
 - given full path, it drops password related to this path::
 
-    hg keyring_clear https://bitbucket.org/Mekk/mercurial_keyring
+    hg keyring_clear https://foss.heptapod.net/mercurial/mercurial_keyring
 
 Managing passwords using GUI tools
 ------------------------------------------------------
@@ -377,7 +377,7 @@ install some missing tool, or library, a
    entrypoints to find available backends. Those are incompatible with
    some binary packaging methods (like ``py2app``) and may cause
    problems. In particular there were packaged installations of TortoiseHG
-   which were unable to load keyring backends. See `#61 <https://bitbucket.org/Mekk/mercurial_keyring/issues/61/tortoisehg-encounters-unknown-exception>`_ for some more details.
+   which were unable to load keyring backends. See `#61 <https://foss.heptapod.net/mercurial/mercurial_keyring/issues/61/tortoisehg-encounters-unknown-exception>`_ for some more details.
 
 
 If ``keyring`` command works, but mercurial with mercurial_keyring does not,
@@ -398,11 +398,17 @@ History
 
 See `HISTORY.rst`_.
 
-Development
-=======================================================
+Repository, bug reports, enhancement suggestions
+===================================================
+
+Development is tracked on HeptaPod, see 
+https://foss.heptapod.net/mercurial/mercurial_keyring/
 
-Development is tracked on BitBucket, see 
-http://bitbucket.org/Mekk/mercurial_keyring/
+Use issue tracker there for bug reports and enhancement
+suggestions.
+
+Thanks to Octobus_ and `Clever Cloud`_ for hosting this service.
+
 
 
 Additional notes
@@ -413,10 +419,13 @@ on Mercurial Wiki: http://mercurial.sele
 
 Check also `other Mercurial extensions I wrote`_.
 
+.. _Octobus: https://octobus.net/
+.. _Clever Cloud: https://www.clever-cloud.com/
+
 .. _other Mercurial extensions I wrote: http://mekk.bitbucket.io/mercurial.html
 
-.. _HISTORY.rst: http://bitbucket.org/Mekk/mercurial_keyring/src/tip/HISTORY.rst
+.. _HISTORY.rst: https://foss.heptapod.net/mercurial/mercurial_keyring/src/tip/HISTORY.rst
 .. _TortoiseHg: http://tortoisehg.bitbucket.org/
 .. _Mercurial: http://mercurial.selenic.com
-.. _mercurial_extension_utils: https://bitbucket.org/Mekk/mercurial-extension_utils/
-.. _Path Pattern: https://bitbucket.org/Mekk/mercurial-path_pattern/
+.. _mercurial_extension_utils: https://foss.heptapod.net/mercurial/mercurial-extension_utils/
+.. _Path Pattern: https://foss.heptapod.net/mercurial/mercurial-path_pattern/
diff --git a/mercurial_keyring.py b/mercurial_keyring.py
--- a/mercurial_keyring.py
+++ b/mercurial_keyring.py
@@ -103,7 +103,7 @@ def import_meu():
         except ImportError:
             raise error.Abort(_("""Can not import mercurial_extension_utils.
 Please install this module in Python path.
-See Installation chapter in https://bitbucket.org/Mekk/mercurial_keyring/ for details
+See Installation chapter in https://foss.heptapod.net/mercurial/mercurial_keyring/ for details
 (and for info about TortoiseHG on Windows, or other bundled Python)."""))
     return mercurial_extension_utils
 
@@ -884,4 +884,4 @@ def cmd_keyring_clear(ui, repo, path, **
                             user, final_url))
 
 
-buglink = 'https://bitbucket.org/Mekk/mercurial_keyring/issues'
+buglink = 'https://foss.heptapod.net/mercurial/mercurial_keyring/issues'
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ setup(
     version=VERSION,
     author='Marcin Kasperski',
     author_email='Marcin.Kasperski@mekk.waw.pl',
-    url='http://bitbucket.org/Mekk/mercurial_keyring',
+    url='https://foss.heptapod.net/mercurial/mercurial_keyring',
     description='Mercurial Keyring Extension',
     long_description=LONG_DESCRIPTION,
     license='BSD',