diff --git a/.appveyor-build.sh b/.appveyor-build.sh
new file mode 100644
index 00000000..6a00f596
--- /dev/null
+++ b/.appveyor-build.sh
@@ -0,0 +1,8 @@
+set -v
+
+export PATH=/mingw64/bin:/usr/local/bin:/usr/bin:/bin:/c/Windows/system32:/c/Windows:/c/Windows/System32/Wbem:/c/Windows/System32/WindowsPowerShell/v1.0:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
+
+sh ./autogen.sh
+./configure --prefix=c:/projects/charybdis/build --enable-openssl=/mingw64
+make -j2
+make install
diff --git a/.appveyor.yml b/.appveyor.yml
new file mode 100644
index 00000000..6b401717
--- /dev/null
+++ b/.appveyor.yml
@@ -0,0 +1,15 @@
+version: 3.6-dev_{build}
+clone_depth: 10
+install:
+  - c:\msys64\usr\bin\sh.exe -lc "pacman -Sy --noconfirm git"
+  - c:\msys64\usr\bin\sh.exe -lc "uname -a"
+  - c:\msys64\usr\bin\sh.exe -lc "cat /proc/cpuinfo"
+  - c:\msys64\usr\bin\sh.exe -lc "cat /proc/meminfo"
+  - c:\msys64\usr\bin\sh.exe -lc "cygcheck -s -v > $APPVEYOR_BUILD_FOLDER/cygcheck.log 2>&1"
+  - ps: Push-AppveyorArtifact cygcheck.log
+build_script:
+  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER; sh .appveyor-build.sh"
+#  - c:\msys64\usr\bin\sh.exe -lc "cd $APPVEYOR_BUILD_FOLDER/build/bin; ./charybdis -version"
+on_failure:
+  - ps: Push-AppveyorArtifact config.log
+  - ps: Push-AppveyorArtifact librb\include\librb-config.h
diff --git a/configure.ac b/configure.ac
index 1de852d7..5ac46956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ case "$host_os" in
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      ;;
-*mingw*)
+*mingw* | *msys*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_CHECK_HEADER(winsock2.h, , [AC_MSG_ERROR([** MinGW and no winsock2.h.  I give up.])])
diff --git a/ircd/s_user.c b/ircd/s_user.c
index f1fc52a4..46a1ee61 100644
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -1464,10 +1464,8 @@ change_nick_user_host(struct Client *target_p,	const char *nick, const char *use
 								    target_p->info);
 
 			if(*mode)
-				sendto_channel_local_butone(target_p, ALL_MEMBERS, chptr,
-						":%s MODE %s +%s %s",
-						target_p->servptr->name,
-						chptr->chname, mode, modeval);
+				sendto_channel_local_with_capability_butone(target_p, ALL_MEMBERS, NOCAPS, CLICAP_CHGHOST, chptr,
+						":%s MODE %s +%s %s", target_p->servptr->name, chptr->chname, mode, modeval);
 
 			*modeval = '\0';
 		}
diff --git a/librb/configure.ac b/librb/configure.ac
index a0fefbae..127214d3 100644
--- a/librb/configure.ac
+++ b/librb/configure.ac
@@ -62,7 +62,7 @@ case "$host_os" in
      AC_DEFINE_UNQUOTED(CYGWIN,1,[This is a Cygwin system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      ;;
-*mingw*)
+*mingw* | *msys*)
      AC_DEFINE_UNQUOTED(MINGW,1,[This is a MinGW system])
      AC_DEFINE_UNQUOTED(WINDOWS,1,[This is a Windows system])
      AC_CHECK_HEADER(windows.h, , [AC_MSG_ERROR([** MinGW and no windows.h.  I give up.])])