diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml
index 2feefa5f..eb6b66b8 100644
--- a/.github/workflows/buildwheel.yml
+++ b/.github/workflows/buildwheel.yml
@@ -80,28 +80,6 @@ jobs:
           name: sdist
           path: dist/*.tar.gz
 
-  test_rst:
-    needs: build_wheels
-    name: Test rst docs
-    runs-on: ubuntu-20.04
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: actions/setup-python@v5
-        with:
-          python-version: '3.12'
-
-      - uses: actions/download-artifact@v4
-        with:
-          name: wheels-ubuntu-20.04
-          path: wheelhouse
-
-      - run: pip install --upgrade pip
-      - run: pip install pytest
-      - run: pip install --no-index --find-links wheelhouse python_flint
-      - run: pytest --doctest-glob='*.rst' doc/source
-
   test_wheels:
     needs: build_wheels
     name: Test ${{ matrix.python-version }} wheel on ${{ matrix.os }}
@@ -143,6 +121,22 @@ jobs:
       - run: pip install .
       - run: python -m flint.test --verbose
 
+  test_docs:
+    name: Test docs (build and doctest)
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - run: sudo apt-get update
+      - run: sudo apt-get install libflint-dev
+
+      - run: pip install --upgrade pip
+      - run: pip install -r requirements-dev.txt
+      - run: spin run -- pytest --doctest-glob='*.rst' doc/source
+      - run: spin docs
+
   # Test build with minimum Cython and meson-python versions.
   test_old_build_requires:
     name: 'Test old Cython/meson-python'
diff --git a/README.md b/README.md
index f47e99df..0b2b8e40 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@ and Arb (arbitrary-precision ball arithmetic). Features:
 * Polynomials, power series and matrices over all the above types
 * Lots of mathematical functions
 
-Documentation: http://fredrikj.net/python-flint/
+Documentation: https://python-flint.readthedocs.io/en/latest/
 
 Repository: https://github.com/flintlib/python-flint/
 
@@ -67,7 +67,7 @@ as follows:
 See the documentation for further notes on building and installing
 python-flint:
 
-* https://fredrikj.net/python-flint/setup.html
+* https://python-flint.readthedocs.io/en/latest/setup.html
 
 Examples
 -------------------------------------
diff --git a/pyproject.toml b/pyproject.toml
index d183220d..e10b47aa 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -4,7 +4,6 @@ description = "Bindings for FLINT"
 version = "0.7.0a4"
 # This needs to be in sync with README, cibuildwheel and CI config.
 requires-python = ">= 3.10"
-urls = {Homepage = "https://github.com/flintlib/python-flint"}
 authors = [
     {name = "Fredrik Johansson", email = "fredrik.johansson@gmail.com"},
 ]
@@ -13,6 +12,12 @@ classifiers = [
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 
+[project.urls]
+Homepage = "https://github.com/flintlib/python-flint"
+Documentation = "https://python-flint.readthedocs.io/en/latest/"
+Repository = "https://github.com/flintlib/python-flint"
+Changelog = "https://github.com/flintlib/python-flint/blob/master/README.md#changelog"
+
 [project.readme]
 file = "README.md"
 content-type = "text/markdown"
diff --git a/src/flint/types/fmpz_mod_poly.pyx b/src/flint/types/fmpz_mod_poly.pyx
index 7d6f088e..4b39b1b9 100644
--- a/src/flint/types/fmpz_mod_poly.pyx
+++ b/src/flint/types/fmpz_mod_poly.pyx
@@ -1660,7 +1660,7 @@ cdef class fmpz_mod_poly(flint_poly):
         :math:`f^e \mod x^n`/
 
         Note: For exponents larger that 2^31 (which do not fit inside a ulong) use the
-        method :method:`~.pow_mod` with the explicit modulus `x^n`.
+        method :meth:`~.pow_mod` with the explicit modulus `x^n`.
 
             >>> R = fmpz_mod_poly_ctx(163)
             >>> x = R.gen()
diff --git a/src/flint/types/fq_default_poly.pyx b/src/flint/types/fq_default_poly.pyx
index 9e86c015..1adcd885 100644
--- a/src/flint/types/fq_default_poly.pyx
+++ b/src/flint/types/fq_default_poly.pyx
@@ -1139,7 +1139,7 @@ cdef class fq_default_poly(flint_poly):
         :math:`f^e \mod x^n`/
 
         Note: For exponents larger that 2^31 (which do not fit inside a ulong) use the
-        method :method:`~.pow_mod` with the explicit modulus `x^n`.
+        method :meth:`~.pow_mod` with the explicit modulus `x^n`.
 
             >>> R = fq_default_poly_ctx(163)
             >>> x = R.gen()