diff --git a/appveyor.yml b/appveyor.yml
index 83322142f..0bd522d78 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 8.0.0.0.{build}
+version: 8.1.0.0.{build}
 image: Visual Studio 2015
 
 branches:
diff --git a/contrib/win32/openssh/config.h.vs b/contrib/win32/openssh/config.h.vs
index 6460249e7..75b019997 100644
--- a/contrib/win32/openssh/config.h.vs
+++ b/contrib/win32/openssh/config.h.vs
@@ -359,6 +359,12 @@
 /* Define to 1 if you have the `EVP_sha256' function. */
 #define HAVE_EVP_SHA256 1
 
+/* Define to 1 if you have the `EVP_sha384' function. */
+#define HAVE_EVP_SHA384 1
+
+/* Define to 1 if you have the `EVP_sha512' function. */
+#define HAVE_EVP_SHA512 1
+
 /* Define if you have ut_exit in utmp.h */
 /* #undef HAVE_EXIT_IN_UTMP */
 
diff --git a/contrib/win32/openssh/keygen.vcxproj b/contrib/win32/openssh/keygen.vcxproj
index c39d0882e..715f91e33 100644
--- a/contrib/win32/openssh/keygen.vcxproj
+++ b/contrib/win32/openssh/keygen.vcxproj
@@ -375,6 +375,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="$(OpenSSH-Src-Path)ssh-keygen.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)sshsig.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" />
   </ItemGroup>
diff --git a/contrib/win32/openssh/libssh.vcxproj b/contrib/win32/openssh/libssh.vcxproj
index a57dff3cf..e347b5ed6 100644
--- a/contrib/win32/openssh/libssh.vcxproj
+++ b/contrib/win32/openssh/libssh.vcxproj
@@ -359,7 +359,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)cipher.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)compat.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)crc32.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)dh.c">
       <ExcludedFromBuild Condition="$(UseOpenSSL)==false">true</ExcludedFromBuild>
     </ClCompile>
@@ -429,7 +428,6 @@
     <ClCompile Include="$(OpenSSH-Src-Path)sshkey.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)ssh_api.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)umac.c" />
-    <ClCompile Include="$(OpenSSH-Src-Path)uuencode.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)verify.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)xmalloc.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)platform-misc.c" />
diff --git a/contrib/win32/openssh/openbsd_compat.vcxproj b/contrib/win32/openssh/openbsd_compat.vcxproj
index 79e937c9b..6b986b107 100644
--- a/contrib/win32/openssh/openbsd_compat.vcxproj
+++ b/contrib/win32/openssh/openbsd_compat.vcxproj
@@ -71,6 +71,7 @@
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\kludge-fd_set.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\libressl-api-compat.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\md5.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\memmem.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\mktemp.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\openssl-compat.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\port-irix.c" />
diff --git a/contrib/win32/openssh/sftp-server.vcxproj b/contrib/win32/openssh/sftp-server.vcxproj
index e47bb3445..92bf06c9c 100644
--- a/contrib/win32/openssh/sftp-server.vcxproj
+++ b/contrib/win32/openssh/sftp-server.vcxproj
@@ -37,6 +37,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="$(OpenSSH-Src-Path)sftp-common.c" />
+    <ClCompile Include="$(OpenSSH-Src-Path)sftp-realpath.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)sftp-server-main.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)sftp-server.c" />
     <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" />
diff --git a/contrib/win32/openssh/version.rc b/contrib/win32/openssh/version.rc
index e009d7f04..1b72f6e12 100644
--- a/contrib/win32/openssh/version.rc
+++ b/contrib/win32/openssh/version.rc
@@ -51,8 +51,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 8,0,0,0
- PRODUCTVERSION 8,0,0,0
+ FILEVERSION 8,1,0,0
+ PRODUCTVERSION 8,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -67,9 +67,9 @@ BEGIN
     BEGIN
         BLOCK "040904b0"
         BEGIN
-            VALUE "FileVersion", "8.0.0.0"
+            VALUE "FileVersion", "8.1.0.0"
             VALUE "ProductName", "OpenSSH for Windows"
-            VALUE "ProductVersion", "OpenSSH_8.0p1 for Windows"
+            VALUE "ProductVersion", "OpenSSH_8.1p1 for Windows"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/contrib/win32/win32compat/inc/stdlib.h b/contrib/win32/win32compat/inc/stdlib.h
index b2186c16b..1e42b9eed 100644
--- a/contrib/win32/win32compat/inc/stdlib.h
+++ b/contrib/win32/win32compat/inc/stdlib.h
@@ -6,3 +6,4 @@ void freezero(void *, size_t);
 int setenv(const char *name, const char *value, int rewrite);
 #define system w32_system
 int w32_system(const char *command);
+char* realpath(const char *pathname, char *resolved);
diff --git a/readconf.c b/readconf.c
index e62d99ed1..1eb22bf0b 100644
--- a/readconf.c
+++ b/readconf.c
@@ -486,7 +486,7 @@ execute_in_shell(const char *cmd)
 
 #ifdef WINDOWS
 	return system(cmd);
-#endif
+#else
 
 	if ((shell = getenv("SHELL")) == NULL)
 		shell = _PATH_BSHELL;
@@ -543,6 +543,7 @@ execute_in_shell(const char *cmd)
 	}
 	debug3("command returned status %d", WEXITSTATUS(status));
 	return WEXITSTATUS(status);
+#endif
 }
 
 /*
diff --git a/sshkey.c b/sshkey.c
index 862010f50..4b29bfcf9 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -61,6 +61,7 @@
 #ifdef WITH_XMSS
 #include "sshkey-xmss.h"
 #include "xmss_fast.h"
+#endif
 #ifdef WINDOWS
 #include <lmcons.h>
 #endif