diff --git a/Changes b/Changes
index 94fcf76e8..f57fd7370 100644
--- a/Changes
+++ b/Changes
@@ -2483,3 +2483,7 @@
 - Fix bug where recursive includes would hang the IRCd, patch from
   binki with some minor modifications, reported by warg (#3919).
 - Upgraded to c-ares 1.9.1. Updated configure & other files.
+- Disable USE_POLL on Windows, since it doesn't work with XP and has
+  no advantage anyway. Reported by nenolod (#4129).
+- Various updates to makefile.win32 and .iss file, found during
+  building new versions of zlib, openssl, and curl.
diff --git a/include/config.h b/include/config.h
index 3d6095bbf..bc0e7cee0 100644
--- a/include/config.h
+++ b/include/config.h
@@ -71,9 +71,14 @@
 #undef NO_FDLIST
 
 /*
- * Defining this will enable poll() usage instead of select()
+ * Defining this will enable poll() usage instead of select().
+ * This is the default on *NIX as of 3.2.10.
+ * On Windows this would require Vista or newer so we stick with
+ * select for now.
  */
+#ifndef _WIN32
 #define USE_POLL
+#endif
 
 /*
  * Defining this will allow all ircops to see people in +s channels
diff --git a/makefile.win32 b/makefile.win32
index dfb3f8615..e2778f43f 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -107,7 +107,7 @@ TRE_LIB=/LIBPATH:"$(TRE_LIB_DIR)"
 !IFDEF USE_REMOTEINC
 CURLCFLAGS=/D USE_LIBCURL
 CURLOBJ=SRC/URL.OBJ
-CURLLIB=libcurl_imp.lib
+CURLLIB=libcurl.lib
 !IFDEF LIBCURL_INC_DIR
 LIBCURL_INC=/I "$(LIBCURL_INC_DIR)"
 !ENDIF
diff --git a/src/win32/unrealinst.iss b/src/win32/unrealinst.iss
index 420bd1e3e..5272a6c88 100644
--- a/src/win32/unrealinst.iss
+++ b/src/win32/unrealinst.iss
@@ -68,7 +68,7 @@ Source: "..\..\aliases\*"; DestDir: "{app}\aliases"; Flags: ignoreversion
 Source: "..\..\unreal.exe"; DestDir: "{app}"; Flags: ignoreversion; MinVersion: 0,4.0
 Source: "..\modules\*.dll"; DestDir: "{app}\modules"; Flags: ignoreversion
 Source: "c:\dev\tre\win32\release\tre.dll"; DestDir: "{app}"; Flags: ignoreversion
-Source: "C:\dev\c-ares\vc\cares\dll-release\cares.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\dev\c-ares\msvc90\cares\dll-release\cares.dll"; DestDir: "{app}"; Flags: ignoreversion
 #ifdef USE_SSL
 Source: "c:\openssl\bin\openssl.exe"; DestDir: "{app}"; Flags: ignoreversion
 Source: "c:\openssl\bin\ssleay32.dll"; DestDir: "{app}"; Flags: ignoreversion
@@ -79,18 +79,18 @@ Source: ".\encpem.bat"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\ssl.cnf"; DestDir: "{app}"; Flags: ignoreversion
 #endif
 #ifdef USE_ZIP
-Source: "c:\dev\zlib\dll32\zlibwapi.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "c:\dev\zlib\zlibwapi.dll"; DestDir: "{app}"; Flags: ignoreversion
 #endif
 #ifdef USE_SSL
 #ifdef USE_CURL
 ; curl with ssl support
-Source: "c:\dev\curl-ssl\lib\dll-release\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\dev\curl-ssl\builds\libcurl-release-dll-sspi-spnego\bin\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
 Source: "..\..\curl-ca-bundle.crt"; DestDir: "{app}"; Flags: ignoreversion
 #endif
 #else
 #ifdef USE_CURL
 ; curl without ssl support
-Source: "c:\dev\curl\lib\dll-release\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "C:\dev\curl\builds\libcurl-release-dll-sspi-spnego\bin\libcurl.dll"; DestDir: "{app}"; Flags: ignoreversion
 #endif
 #endif
 Source: isxdl.dll; DestDir: {tmp}; Flags: dontcopy