diff --git a/README.rst b/README.rst
index 2ab0381..185d9cd 100644
--- a/README.rst
+++ b/README.rst
@@ -1,13 +1,13 @@
 APRS library for Python
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-|pypi| |coverage| |scru| |master_build|
+|pypi| |coverage| |scru| |master_build| |docs|
 
 A python library for dealing with APRS.
 It can be used to interact with APRS-IS servers, sending and receiving.
 Parsing functionally is also included, but currently doesn't implement the full spec.
 
-See `full documentation <http://rgp.io/aprs-python/>`_.
+See `the documentation <http://aprs-python.readthedocs.io/en/latest/>`_.
 
 Installation
 ============
@@ -16,7 +16,7 @@ To install the latest release from ``pypi``::
 
     pip install aprslib
 
-To install the latest dev version from the `Github repo <https://github.com/rossengeorgiev/aprs-python://github.com/rossengeorgiev/aprs-python/>`_::
+To install the latest dev version from the `Github repo <https://github.com/rossengeorgiev/aprs-python/>`_::
 
     pip install git+https://github.com/rossengeorgiev/aprs-python
 
@@ -44,3 +44,6 @@ Contribution
     :target: http://travis-ci.org/rossengeorgiev/aprs-python
     :alt: Build status of master branch
 
+.. |docs| image:: https://readthedocs.org/projects/aprs-python/badge/?version=latest
+    :target: http://aprs-python.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation status
diff --git a/setup.py b/setup.py
index 360ed92..2371382 100644
--- a/setup.py
+++ b/setup.py
@@ -8,7 +8,10 @@ from aprslib import __version__ as lib_version
 
 here = path.abspath(path.dirname(__file__))
 with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
-    long_description = f.read()
+    long_description = f.read()\
+                        .replace('.io/en/latest/', '.io/en/stable/')\
+                        .replace('?badge=latest', '?badge=stable')\
+                        .replace('projects/aprs-python/badge/?version=latest', 'projects/aprs-python/badge/?version=stable')
 
 setup(
     name='aprslib',