diff --git a/aip_site/models/aip.py b/aip_site/models/aip.py
index 053b634..7aad16e 100644
--- a/aip_site/models/aip.py
+++ b/aip_site/models/aip.py
@@ -57,15 +57,16 @@ def content(self) -> md.MarkdownDocument:
         )
 
         # Hotlink AIP references.
-        # We only hotlink the generally-applicable ones for now until we have
-        # a prefix system implemented.
+        # We can (now) link to AIPs outside of general, those that are numbered
+        # > 999, because the site redirects from 4221 to client-libraries/4221
+        # now, for example.
         answer = re.sub(
-            r'\b(?<!\[)AIP-([\d]{1,3})\b',  # AIP-###, but not after a `[`.
+            r'\b(?<!\[)AIP-(\d+)\b',  # AIP-###, but not after a `[`.
             fr'[AIP-\1]({self.site.relative_uri}/\1)',
             answer,
         )
         answer = re.sub(
-            r'(?<=\])\[aip-([\d]{1,3})\]',  # [aip-###], after a `]`.
+            r'(?<=\])\[aip-(\d+)\]',  # [aip-###], after a `]`.
             fr'({self.site.relative_uri}/\1)',
             answer,
         )
diff --git a/tests/test_data/aip/general/0031.md b/tests/test_data/aip/general/0031.md
index 954b728..cecf112 100644
--- a/tests/test_data/aip/general/0031.md
+++ b/tests/test_data/aip/general/0031.md
@@ -31,3 +31,5 @@ author deeply.
 - For more from Victor Hugo, read AIP-62.
 - For Dickens instead, consult [AIP-43](./0043.md).
 - More Dickens is available in [A Tale of Two Cities][aip-59].
+- If you like poetry, AIP-1609 or [Orpheus][aip-1622] might be for you.
+
diff --git a/tests/test_models_aip.py b/tests/test_models_aip.py
index 8d11e3a..f32f753 100644
--- a/tests/test_models_aip.py
+++ b/tests/test_models_aip.py
@@ -33,6 +33,8 @@ def test_content_hotlinking(site):
     hunchback = site.aips[31]
     les_mis = site.aips[62]
     assert '[AIP-62](/62)' in hunchback.content
+    assert '[Orpheus](/1622)' in hunchback.content
+    assert '[AIP-1609](/1609)' in hunchback.content
     assert '[A Tale of Two Cities](/59)' in hunchback.content
     assert '[AIP-31](/31)' in les_mis.content
     assert '[[AIP-31](/31)](/31)' not in les_mis.content