diff --git a/content/api/gen-docs.janet b/content/api/gen-docs.janet
index fb872637..ce1e3076 100644
--- a/content/api/gen-docs.janet
+++ b/content/api/gen-docs.janet
@@ -24,7 +24,8 @@
 (def- url-repl-chars
   {(chr "%") "%25"
    (chr "?") "_q"
-   (chr "=") "%3d"})
+   (chr "=") "%3d"
+   (chr "/") "%2f"})
 
 (defn jdoc-escape
   [str]
@@ -96,7 +97,7 @@
                               :content {:tag "code" :language (require "janet.syntax") :content (string example)}}] [])
                (if c-example
                  {:tag "a" "href"
-                  (string "https://janetdocs.com/" (jdoc-escape key))
+                  (string "https://janetdocs.org/core-api/" (jdoc-escape key)) # Spork will be "https://janetdocs.org/spork/", JPM .org/jpm/ etc.
                   :content "Community Examples"})]}))
 
 (defn- all-entries 
diff --git a/content/index.mdz b/content/index.mdz
index 9a8c8daa..41d7ad0f 100644
--- a/content/index.mdz
+++ b/content/index.mdz
@@ -149,4 +149,4 @@ We also support @link[https://github.com/janet-lang/janet/discussions]{GitHub Di
 
 ### Janet Docs
 
-For help, you can also check out @link[https://janetdocs.com]{Janet Docs} for Janet documentation with user-provided examples. Feel free to contribute your own examples here to help fellow programmers.
+For help, you can also check out @link[https://janetdocs.org]{Janet Docs} for Janet documentation with user-provided examples. Feel free to contribute your own examples here to help fellow programmers.