diff --git a/source/global/IDEsettings.bas b/source/global/IDEsettings.bas
index df734ce68..f04c9ef68 100644
--- a/source/global/IDEsettings.bas
+++ b/source/global/IDEsettings.bas
@@ -19,6 +19,7 @@ DIM SHARED windowSettingsSection$, colorSettingsSection$, customDictionarySectio
 DIM SHARED mouseSettingsSection$, generalSettingsSection$, displaySettingsSection$
 DIM SHARED colorSchemesSection$, debugSettingsSection$, iniFolderIndex$, DebugInfoIniWarning$, ConfigFile$
 DIM SHARED idebaseTcpPort AS LONG, AutoAddDebugCommand AS _BYTE
+DIM SHARED wikiBaseAddress$
 
 ConfigFile$ = "internal/config.ini"
 iniFolderIndex$ = STR$(tempfolderindex)
@@ -217,6 +218,13 @@ IF result = 0 OR idedebuginfo <> 1 THEN
 END IF
 Include_GDB_Debugging_Info = idedebuginfo
 
+wikiBaseAddress$ = "https://wiki.qb64.org"
+IF ReadConfigSetting(generalSettingsSection$, "WikiBaseAddress", value$) THEN
+    wikiBaseAddress$ = value$
+ELSE WriteConfigSetting generalSettingsSection$, "WikiBaseAddress", wikiBaseAddress$
+END IF
+
+
 'Mouse settings ---------------------------------------------------------------
 result = ReadConfigSetting(mouseSettingsSection$, "SwapMouseButton", value$)
 IF UCASE$(value$) = "TRUE" OR VAL(value$) = -1 THEN
diff --git a/source/ide/wiki/wiki_methods.bas b/source/ide/wiki/wiki_methods.bas
index c268fbfc7..6ae2977a2 100644
--- a/source/ide/wiki/wiki_methods.bas
+++ b/source/ide/wiki/wiki_methods.bas
@@ -49,6 +49,13 @@ FUNCTION Wiki$ (PageName$)
         END IF
     END IF
 
+    IF _SHELLHIDE("curl --version") <> 0 THEN
+        PCOPY 2, 0
+        result = idemessagebox("QB64", "Cannot find 'curl'.", "#Abort")
+        PCOPY 3, 0: SCREEN , , 3, 0
+        EXIT FUNCTION
+    END IF
+
     IF Help_Recaching = 0 THEN
         a$ = "Downloading '" + PageName$ + "' page..."
         IF LEN(a$) > 60 THEN a$ = LEFT$(a$, 57) + STRING$(3, 250)
@@ -60,58 +67,36 @@ FUNCTION Wiki$ (PageName$)
         PCOPY 3, 0
     END IF
 
-    url$ = "www.qb64.org/wiki/index.php?title=" + PageName2$ + "&action=edit"
-    'when fetching from .org, look for name="wpTextbox1">
-    s1$ = "name=" + CHR$(34) + "wpTextbox1" + CHR$(34) + ">"
-    url2$ = url$
-    x = INSTR(url2$, "/")
-    IF x THEN url2$ = LEFT$(url$, x - 1)
-    c = _OPENCLIENT("TCP/IP:80:" + url2$)
-    IF c = 0 THEN
-        EXIT FUNCTION
-    END IF
-    e$ = CHR$(13) + CHR$(10)
-    url3$ = RIGHT$(url$, LEN(url$) - x + 1)
-    x$ = "GET " + url3$ + " HTTP/1.1" + e$
-    x$ = x$ + "Host: " + url2$ + e$ + e$
-    PUT #c, , x$
-    t! = TIMER
+    url$ = CHR$(34) + wikiBaseAddress$ + "/index.php?title=" + PageName2$ + "&action=edit" + CHR$(34)
+    outputFile$ = Cache_Folder$ + "/" + PageName2$ + ".txt"
 
-    DO
-        GET #c, , a2$
-        IF LEN(a2$) THEN
-            a$ = a$ + a2$
-            IF INSTR(a$, "</body>") THEN
-                CLOSE #c
-                s2$ = "</textarea>"
-                s1 = INSTR(a$, s1$): IF s1 = 0 THEN EXIT FUNCTION
-                s1 = s1 + LEN(s1$)
-                s2 = INSTR(a$, s2$): IF s2 = 0 THEN EXIT FUNCTION
-                s2 = s2 - 1
-                IF s1 > s2 THEN EXIT FUNCTION
-                a$ = MID$(a$, s1, s2 - s1 + 1)
-                fh = FREEFILE
-                E = 0
-                ON ERROR GOTO qberror_test
-                OPEN Cache_Folder$ + "/" + PageName2$ + ".txt" FOR OUTPUT AS #fh 'clear old content
-                ON ERROR GOTO qberror
-                IF E = 0 THEN
-                    CLOSE #fh
-                    ON ERROR GOTO qberror_test
-                    OPEN Cache_Folder$ + "/" + PageName2$ + ".txt" FOR BINARY AS #fh
-                    ON ERROR GOTO qberror
-                    IF E = 0 THEN
-                        PUT #fh, , a$
-                        CLOSE #fh
-                    END IF
-                END IF
-                Wiki$ = a$
-                EXIT FUNCTION
-            END IF
+    'wiki text delimiters:
+    s1$ = "name=" + CHR$(34) + "wpTextbox1" + CHR$(34) + ">"
+    s2$ = "</textarea>"
+
+    SHELL _HIDE "curl -o " + CHR$(34) + outputFile$ + CHR$(34) + " " + url$
+    fh = FREEFILE
+    OPEN outputFile$ FOR BINARY AS #fh 'get new content
+    a$ = SPACE$(LOF(fh))
+    GET #fh, 1, a$
+    CLOSE #fh
+
+    s1 = INSTR(a$, s1$)
+    IF s1 > 0 THEN
+        'clean up downloaded contents
+        a$ = MID$(a$, s1 + LEN(s1$))
+        s2 = INSTR(a$, s2$)
+        IF s2 > 0 THEN
+            a$ = LEFT$(a$, s2)
         END IF
-        _LIMIT 100
-    LOOP UNTIL ABS(TIMER - t!) > 20
-    CLOSE #c
+
+        OPEN outputFile$ FOR OUTPUT AS #fh 'clear old content
+        PRINT #fh, a$ 'save clean content
+        CLOSE #fh
+    END IF
+
+    Wiki$ = a$
+    EXIT FUNCTION
 END FUNCTION
 
 SUB Help_AddTxt (t$, col, link)