diff --git a/configure.ac b/configure.ac
index e3fadf9d2e..5830d962fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1941,6 +1941,7 @@ win32/vs12/Makefile
 win32/vs14/Makefile
 win32/vs15/Makefile
 win32/vs16/Makefile
+win32/vs17/Makefile
 gdk/Makefile
 gdk/broadway/Makefile
 gdk/x11/Makefile
diff --git a/win32/Makefile.am b/win32/Makefile.am
index 7235e12542..31c8715269 100644
--- a/win32/Makefile.am
+++ b/win32/Makefile.am
@@ -33,7 +33,8 @@ SUBDIRS =	\
 	vs12	\
 	vs14	\
 	vs15	\
-	vs16
+	vs16	\
+	vs17
 
 EXTRA_DIST +=	\
 	config-msvc.mak		\
diff --git a/win32/vs10/gtk3-version-paths.props.in b/win32/vs10/gtk3-version-paths.props.in
index 59d59dbda6..f8c0a16bba 100644
--- a/win32/vs10/gtk3-version-paths.props.in
+++ b/win32/vs10/gtk3-version-paths.props.in
@@ -18,12 +18,15 @@
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|Win32'">c:\python36</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '17.0|Win32'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">c:\python34.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">c:\python36.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">c:\python36.x64</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|x64'">c:\python36.x64</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '17.0|x64'">c:\python36.x64</PythonDir>
+
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/win32/vs17/Makefile.am b/win32/vs17/Makefile.am
new file mode 100644
index 0000000000..7d65a4f8e5
--- /dev/null
+++ b/win32/vs17/Makefile.am
@@ -0,0 +1,52 @@
+include $(top_srcdir)/Makefile.decl
+
+EXTRA_DIST +=	\
+	README.txt	\
+	gtk+.sln	\
+	gtk3-prebuild.vcxproj	\
+	gdk3-win32.vcxproj	\
+	gdk3-win32.vcxproj.filters	\
+	gdk-3.vcxproj	\
+	gdk-3.vcxproj.filters	\
+	gtk-3.vcxproj	\
+	gtk-3.vcxproj.filters	\
+	gtk-builder-tool.vcxproj		\
+	gtk-builder-tool.vcxproj.filters	\
+	gtk-encode-symbolic-svg.vcxproj	\
+	gtk-encode-symbolic-svg.vcxproj.filters	\
+	gtk-query-settings.vcxproj		\
+	gtk-query-settings.vcxproj.filters	\
+	gtk-update-icon-cache.vcxproj		\
+	gtk-update-icon-cache.vcxproj.filters	\
+	gtk3-demo.vcxproj	\
+	gtk3-demo.vcxproj.filters	\
+	gtk3-demo-application.vcxproj	\
+	gtk3-demo-application.vcxproj.filters	\
+	gtk3-icon-browser.vcxproj	\
+	gtk3-icon-browser.vcxproj.filters	\
+	gailutil-3.vcxproj	\
+	gailutil-3.vcxproj.filters	\
+	gtk3-install.vcxproj	\
+	gtk3-install.vcxproj.filters	\
+	gtk3-introspect.vcxproj		\
+	broadwayd.vcxproj	\
+	broadwayd.vcxproj.filters	\
+	gdk3-broadway.vcxproj	\
+	gdk3-broadway.vcxproj.filters	\
+	gtk3-build-defines.props	\
+	gtk3-copy-gdk-broadway.props	\
+	gtk3-gen-srcs.props	\
+	gtk3-ignore-broadway.props	\
+	gtk3-install.props	\
+	gtk3-version-paths.props
+
+DISTCLEANFILES = $(EXTRA_DIST)
+
+MSVC_VER = 17
+MSVC_VER_LONG = 17
+MSVC_TOOLSET = 143
+MSVC_FORMAT_VER = 12
+
+include $(top_srcdir)/win32/Makefile-newvs.am
+
+-include $(top_srcdir)/git.mk