diff --git a/src/win32/Stella.vcproj b/src/win32/Stella.vcproj
index eb8df596d..3c316f7a6 100755
--- a/src/win32/Stella.vcproj
+++ b/src/win32/Stella.vcproj
@@ -46,7 +46,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat;..\zlib"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -127,7 +127,7 @@
 				Name="VCCLCompilerTool"
 				AdditionalOptions="/MP"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat;..\zlib"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				MinimalRebuild="false"
 				BasicRuntimeChecks="3"
@@ -209,7 +209,7 @@
 				AdditionalOptions="/MP"
 				OmitFramePointers="true"
 				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
@@ -292,7 +292,7 @@
 				Optimization="4"
 				InlineFunctionExpansion="0"
 				OmitFramePointers="true"
-				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib"
+				AdditionalIncludeDirectories="..\yacc;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng"
 				PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="false"
@@ -374,6 +374,10 @@
 				RelativePath="..\win32\OSystemWin32.cxx"
 				>
 			</File>
+			<File
+				RelativePath="..\common\PNGLibrary.cxx"
+				>
+			</File>
 			<File
 				RelativePath="..\common\RectList.cxx"
 				>
@@ -1002,6 +1006,70 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="libpng"
+				>
+				<File
+					RelativePath="..\libpng\png.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngerror.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngget.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngmem.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngpread.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngread.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngrio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngrtran.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngrutil.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngset.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngtrans.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngwio.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngwrite.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngwtran.c"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngwutil.c"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Header Files"
@@ -1036,6 +1104,10 @@
 				RelativePath="..\win32\OSystemWin32.hxx"
 				>
 			</File>
+			<File
+				RelativePath="..\common\PNGLibrary.hxx"
+				>
+			</File>
 			<File
 				RelativePath="..\common\RectList.hxx"
 				>
@@ -1724,6 +1796,22 @@
 					>
 				</File>
 			</Filter>
+			<Filter
+				Name="libpng"
+				>
+				<File
+					RelativePath="..\libpng\png.h"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngconf.h"
+					>
+				</File>
+				<File
+					RelativePath="..\libpng\pngpriv.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Resource Files"