diff --git a/Makefile.windows b/Makefile.windows
index 6ff0e1bbd..39cb1c956 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -30,15 +30,20 @@ MT=mt
 #SODIUMLIB="libsodium.lib"
 
 ### JANSSON ###
-#JANSSON_LIB_DIR="C:\dev\unrealircd-6-libs\jansson\......."
-#JANSSON_INC_DIR="C:\dev\unrealircd-6-libs\jansson\......."
-#JANSSONLIB="libjansson.lib"
+#JANSSON_LIB_DIR="C:\dev\unrealircd-6-libs\jansson\lib"
+#JANSSON_INC_DIR="C:\dev\unrealircd-6-libs\jansson\include"
+#JANSSONLIB="jansson.lib"
 
 ### C-ARES ####
 #CARES_LIB_DIR="C:\dev\c-ares\vc\cares\dll-release"
 #CARES_INC_DIR="C:\dev\c-ares"
 #CARESLIB="cares.lib"
 
+### GEOIP CLASSIC ###
+#GEOIPCLASSIC_LIB_DIR="c:\dev\unrealircd-6-libs\GeoIP\libGeoIP" ^
+#GEOIPCLASSIC_INC_DIR="c:\dev\unrealircd-6-libs\GeoIP\libGeoIP" ^
+#GEOIPCLASSICLIB="GeoIP.lib"
+
 ##### REMOTE INCLUDES ####
 #To enable remote include support you must have libcurl installed on your
 #system and it must have ares support enabled.
@@ -272,6 +277,7 @@ DLL_FILES=\
  src/modules/extended-monitor.dll \
  src/modules/extjwt.dll \
  src/modules/geoip_base.dll \
+ src/modules/geoip_classic.dll \
  src/modules/geoip_csv.dll \
  src/modules/globops.dll \
  src/modules/help.dll \
@@ -871,7 +877,7 @@ src/modules/extjwt.dll: src/modules/extjwt.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/extjwt.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/extjwt.pdb $(MODLFLAGS)
 
 src/modules/geoip_classic.dll: src/modules/geoip_classic.c $(INCLUDES)
-	$(CC) $(MODCFLAGS) src/modules/geoip_classic.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip_classic.pdb $(MODLFLAGS)
+	$(CC) $(MODCFLAGS) /I "$(GEOIPCLASSIC_INC_DIR)" src/modules/geoip_classic.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip_classic.pdb $(MODLFLAGS) /LIBPATH:"$(GEOIPCLASSIC_LIB_DIR)" $(GEOIPCLASSICLIB)
 
 src/modules/geoip_csv.dll: src/modules/geoip_csv.c $(INCLUDES)
 	$(CC) $(MODCFLAGS) src/modules/geoip_csv.c /Fesrc/modules/ /Fosrc/modules/ /Fdsrc/modules/geoip_csv.pdb $(MODLFLAGS)
diff --git a/extras/build-tests/windows/compilecmd/vs2019.bat b/extras/build-tests/windows/compilecmd/vs2019.bat
index 1cd65e4ca..e1f7d921e 100644
--- a/extras/build-tests/windows/compilecmd/vs2019.bat
+++ b/extras/build-tests/windows/compilecmd/vs2019.bat
@@ -22,6 +22,9 @@ ARGON2LIB="Argon2RefDll.lib" ^
 SODIUM_LIB_DIR="c:\projects\unrealircd-6-libs\libsodium\bin\x64\Release\v142\dynamic" ^
 SODIUM_INC_DIR="c:\projects\unrealircd-6-libs\libsodium\src\libsodium\include" ^
 SODIUMLIB="libsodium.lib" ^
-JANSSON_LIB_DIR="C:\projects\unrealircd-6-libs\jansson\lib" ^
-JANSSON_INC_DIR="C:\projects\unrealircd-6-libs\jansson\include" ^
-JANSSONLIB="jansson.lib" %*
+JANSSON_LIB_DIR="c:\projects\unrealircd-6-libs\jansson\lib" ^
+JANSSON_INC_DIR="c:\projects\unrealircd-6-libs\jansson\include" ^
+JANSSONLIB="jansson.lib" ^
+GEOIPCLASSIC_LIB_DIR="c:\projects\unrealircd-6-libs\GeoIP\libGeoIP" ^
+GEOIPCLASSIC_INC_DIR="c:\projects\unrealircd-6-libs\GeoIP\libGeoIP" ^
+GEOIPCLASSICLIB="GeoIP.lib" %*
diff --git a/src/conf.c b/src/conf.c
index 5b84b449a..fee19fbb7 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3121,6 +3121,11 @@ void convert_to_absolute_path(char **path, const char *reldir)
 	if (strstr(*path, "://"))
 		return; /* URL: don't touch */
 
+#ifdef _WIN32
+	if (!strncmp(*path, "cache/", 6))
+		return; /* downloaded from URL: don't touch (is only relative path on Windows) */
+#endif
+
 	if ((**path == '/') || (**path == '\\'))
 		return; /* already absolute path */
 
diff --git a/src/windows/unrealinst.iss b/src/windows/unrealinst.iss
index 1deea2350..9db4e70c4 100644
--- a/src/windows/unrealinst.iss
+++ b/src/windows/unrealinst.iss
@@ -76,6 +76,7 @@ Source: "c:\dev\unrealircd-6-libs\jansson\bin\*.dll"; DestDir: "{app}\bin"; Flag
 Source: "c:\dev\unrealircd-6-libs\c-ares\msvc\cares\dll-release\cares.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "c:\dev\unrealircd-6-libs\libressl\bin\openssl.exe"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "c:\dev\unrealircd-6-libs\libressl\bin\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
+Source: "c:\dev\unrealircd-6-libs\GeoIP\libGeoIP\*.dll"; DestDir: "{app}\bin"; Flags: ignoreversion
 Source: "c:\dev\unrealircd-6-libs\setacl.exe"; DestDir: "{app}\tmp"; Flags: ignoreversion
 
 #ifdef USE_CURL