diff --git a/Changes b/Changes
index 921a29d9c..9f6ccfad5 100644
--- a/Changes
+++ b/Changes
@@ -1670,3 +1670,12 @@
 - #0003313 reported by Stealth, regarding not erroring/warning when me::name
   is bigger than HOSTLEN, from now it will error on config read. [Backport, sts]
 - /REHASH -all not case sensitive
+- Win32 makefile: removed /MAPINFO:LINES, since visual studio 2005 and up
+  don't support this and will fail to compile UnrealIRCd. This fixes #3680,
+  reported by therock247uk.
+- Upgraded c-ares to 1.6.0 (also now using pkg-config).
+  If you get a "undefined reference to `clock_gettime'" error, then you
+  might consider installing 'pkg-config' on your system, and then simply re-run
+  ./Config and make, should fix things.
+__TODO__: win32 c-ares upgrade to 1.6.0 (and copy & fix header files).
+__TODO__: testing! testing! i'd like to be sure this c-ares is stable!
diff --git a/autoconf/configure.in b/autoconf/configure.in
index 368b3dba0..12b58aead 100644
--- a/autoconf/configure.in
+++ b/autoconf/configure.in
@@ -458,7 +458,7 @@ cd $cur_dir
 
 
 dnl REMEMBER TO CHANGE WITH A NEW C-ARES RELEASE!
-cares_version="1.5.1"
+cares_version="1.6.0"
 AC_MSG_RESULT(extracting c-ares resolver library)
 cur_dir=`pwd`
 cd extras
@@ -483,7 +483,11 @@ CARESINCDIR="$cur_dir/extras/c-ares/include"
 AC_SUBST(CARESINCDIR)
 CARESLIBDIR="-L../extras/c-ares/lib"
 AC_SUBST(CARESLIBDIR)
-CARESLIBS="-lcares"
+if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
+	CARESLIBS="-lcares -lrt"
+else
+	CARESLIBS=`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`
+fi
 AC_SUBST(CARESLIBS)
 cd $cur_dir
 
diff --git a/configure b/configure
index 0373ed991..c0c45dfd8 100755
--- a/configure
+++ b/configure
@@ -12992,7 +12992,7 @@ fi
 cd $cur_dir
 
 
-cares_version="1.5.1"
+cares_version="1.6.0"
 { echo "$as_me:$LINENO: result: extracting c-ares resolver library" >&5
 echo "${ECHO_T}extracting c-ares resolver library" >&6; }
 cur_dir=`pwd`
@@ -13020,7 +13020,11 @@ CARESINCDIR="$cur_dir/extras/c-ares/include"
 
 CARESLIBDIR="-L../extras/c-ares/lib"
 
-CARESLIBS="-lcares"
+if test "x$ac_cv_path_PKGCONFIG" = "x" ; then
+	CARESLIBS="-lcares -lrt"
+else
+	CARESLIBS=`$ac_cv_path_PKGCONFIG --static --libs libcares.pc`
+fi
 
 cd $cur_dir
 
diff --git a/extras/c-ares.tar.gz b/extras/c-ares.tar.gz
index f19ae192c..30623d62d 100644
Binary files a/extras/c-ares.tar.gz and b/extras/c-ares.tar.gz differ
diff --git a/makefile.win32 b/makefile.win32
index b501cca37..9393fc65d 100644
--- a/makefile.win32
+++ b/makefile.win32
@@ -253,7 +253,7 @@ CONF:
 	
 
 ./WIRCD.EXE: $(OBJ_FILES) SRC/win32/WIN32.RES
-        $(LINK) $(LFLAGS) $(OBJ_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB SRC/WIN32/ARESLIB.LIB /MAPINFO:LINES /MAP
+        $(LINK) $(LFLAGS) $(OBJ_FILES) SRC/win32/WIN32.RES SRC/WIN32/TRE.LIB SRC/WIN32/ARESLIB.LIB /MAP
 	-@erase src\win32\win32.res
 !IFNDEF DEBUGEXTRA
  @echo Standard version built