diff --git a/README.rst b/README.rst
index eebb060..99e3d0c 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@ Introduction
 ============
 
 .. image:: https://readthedocs.org/projects/adafruit-circuitpython-pm25/badge/?version=latest
-    :target: https://circuitpython.readthedocs.io/projects/pm25/en/latest/
+    :target: https://docs.circuitpython.org/projects/pm25/en/latest/
     :alt: Documentation Status
 
 .. image:: https://img.shields.io/discord/327254708534116352.svg
@@ -66,7 +66,7 @@ For example usage, see examples/pm25_simpletest.py
 Documentation
 =============
 
-API documentation for this library can be found on `Read the Docs <https://circuitpython.readthedocs.io/projects/pm25/en/latest/>`_.
+API documentation for this library can be found on `Read the Docs <https://docs.circuitpython.org/projects/pm25/en/latest/>`_.
 
 Contributing
 ============
diff --git a/docs/conf.py b/docs/conf.py
index 8ecf6a2..33a9cb7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -29,12 +29,12 @@
 
 
 intersphinx_mapping = {
-    "python": ("https://docs.python.org/3.4", None),
+    "python": ("https://docs.python.org/3", None),
     "BusDevice": (
-        "https://circuitpython.readthedocs.io/projects/busdevice/en/latest/",
+        "https://docs.circuitpython.org/projects/busdevice/en/latest/",
         None,
     ),
-    "CircuitPython": ("https://circuitpython.readthedocs.io/en/latest/", None),
+    "CircuitPython": ("https://docs.circuitpython.org/en/latest/", None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
diff --git a/docs/index.rst b/docs/index.rst
index f111b3c..446f792 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -36,7 +36,7 @@ Table of Contents
     :caption: Other Links
 
     Download <https://github.com/adafruit/Adafruit_CircuitPython_PM25/releases/latest>
-    CircuitPython Reference Documentation <https://circuitpython.readthedocs.io>
+    CircuitPython Reference Documentation <https://docs.circuitpython.org>
     CircuitPython Support Forum <https://forums.adafruit.com/viewforum.php?f=60>
     Discord Chat <https://adafru.it/discord>
     Adafruit Learning System <https://learn.adafruit.com>
diff --git a/setup.py b/setup.py
index 969fbe6..fa684a4 100644
--- a/setup.py
+++ b/setup.py
@@ -47,8 +47,6 @@
         "Topic :: System :: Hardware",
         "License :: OSI Approved :: MIT License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.4",
-        "Programming Language :: Python :: 3.5",
     ],
     # What does your project relate to?
     keywords="adafruit blinka circuitpython micropython pm25 AQI PM2.5 Air Quality",