diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c39fe30
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+/ports/win32/msvc/Debug
+/ports/win32/lwipcfg_msvc.h
+/ports/win32/msvc/Debug unittests
+/ports/win32/msvc/Release
+/ports/win32/msvc/Release unittests
+/ports/win32/msvc/*.user
+/ports/win32/msvc/*.ncb
+/ports/win32/msvc/*.cache
+/ports/win32/msvc/*.suo
diff --git a/ports/win32/.cvsignore b/ports/win32/.cvsignore
deleted file mode 100644
index bd9bed5..0000000
--- a/ports/win32/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-lwipcfg_msvc.h
\ No newline at end of file
diff --git a/ports/win32/msvc8/libcheck.vcproj b/ports/win32/msvc/libcheck.vcproj
similarity index 98%
rename from ports/win32/msvc8/libcheck.vcproj
rename to ports/win32/msvc/libcheck.vcproj
index f8f34a4..fdd04e2 100644
--- a/ports/win32/msvc8/libcheck.vcproj
+++ b/ports/win32/msvc/libcheck.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="libcheck"
 	ProjectGUID="{EBB156DC-01BF-47B2-B69C-1A750B6B5F09}"
 	RootNamespace="libcheck"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
diff --git a/ports/win32/msvc8/lwIP.vcproj b/ports/win32/msvc/lwIP.vcproj
similarity index 99%
rename from ports/win32/msvc8/lwIP.vcproj
rename to ports/win32/msvc/lwIP.vcproj
index 098b9a2..25fbaab 100644
--- a/ports/win32/msvc8/lwIP.vcproj
+++ b/ports/win32/msvc/lwIP.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="lwIP"
 	ProjectGUID="{2CC276FA-B226-49C9-8F82-7FCD5A228E28}"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
diff --git a/ports/win32/msvc8/lwIP_Test.sln b/ports/win32/msvc/lwIP_Test.sln
similarity index 96%
rename from ports/win32/msvc8/lwIP_Test.sln
rename to ports/win32/msvc/lwIP_Test.sln
index 24d50b0..9873679 100644
--- a/ports/win32/msvc8/lwIP_Test.sln
+++ b/ports/win32/msvc/lwIP_Test.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwIP_test", "lwIP_Test.vcproj", "{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}"
 	ProjectSection(ProjectDependencies) = postProject
 		{6F44E49E-9F21-4144-91EC-53B92AEF62CE} = {6F44E49E-9F21-4144-91EC-53B92AEF62CE}
diff --git a/ports/win32/msvc8/lwIP_Test.vcproj b/ports/win32/msvc/lwIP_Test.vcproj
similarity index 98%
rename from ports/win32/msvc8/lwIP_Test.vcproj
rename to ports/win32/msvc/lwIP_Test.vcproj
index ebddf4f..781ac5a 100644
--- a/ports/win32/msvc8/lwIP_Test.vcproj
+++ b/ports/win32/msvc/lwIP_Test.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="lwIP_test"
 	ProjectGUID="{8CC0CE51-32CF-4585-BFAF-A9343BC5A96D}"
 	RootNamespace="lwIP_test"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -77,6 +78,8 @@
 				AdditionalLibraryDirectories="$(PCAP_DIR)\Lib"
 				ProgramDatabaseFile=".\Release/test.pdb"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -163,6 +166,8 @@
 				AdditionalLibraryDirectories="$(PCAP_DIR)\Lib"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/ports/win32/msvc8/lwIP_pcapif.vcproj b/ports/win32/msvc/lwIP_pcapif.vcproj
similarity index 98%
rename from ports/win32/msvc8/lwIP_pcapif.vcproj
rename to ports/win32/msvc/lwIP_pcapif.vcproj
index 7bb24f0..7e18254 100644
--- a/ports/win32/msvc8/lwIP_pcapif.vcproj
+++ b/ports/win32/msvc/lwIP_pcapif.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="lwIP pcapif"
 	ProjectGUID="{6F44E49E-9F21-4144-91EC-53B92AEF62CE}"
 	RootNamespace="lwIP pcapif"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
diff --git a/ports/win32/msvc8/lwIP_unittests.sln b/ports/win32/msvc/lwIP_unittests.sln
similarity index 95%
rename from ports/win32/msvc8/lwIP_unittests.sln
rename to ports/win32/msvc/lwIP_unittests.sln
index 78966ce..aba0d28 100644
--- a/ports/win32/msvc8/lwIP_unittests.sln
+++ b/ports/win32/msvc/lwIP_unittests.sln
@@ -1,5 +1,5 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lwip_unittests", "lwip_unittests.vcproj", "{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EBB156DC-01BF-47B2-B69C-1A750B6B5F09} = {EBB156DC-01BF-47B2-B69C-1A750B6B5F09}
diff --git a/ports/win32/msvc8/lwip_unittests.vcproj b/ports/win32/msvc/lwip_unittests.vcproj
similarity index 92%
rename from ports/win32/msvc8/lwip_unittests.vcproj
rename to ports/win32/msvc/lwip_unittests.vcproj
index 48a20ef..a623cec 100644
--- a/ports/win32/msvc8/lwip_unittests.vcproj
+++ b/ports/win32/msvc/lwip_unittests.vcproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="lwip_unittests"
 	ProjectGUID="{6CCABAA4-F86F-4119-AFF8-43C9A4A234C2}"
 	RootNamespace="lwip_unittests"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -59,6 +60,8 @@
 			<Tool
 				Name="VCLinkerTool"
 				GenerateDebugInformation="true"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -131,6 +134,8 @@
 				GenerateDebugInformation="true"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/ports/win32/msvc8/makefsdata.vcproj b/ports/win32/msvc/makefsdata.vcproj
similarity index 95%
rename from ports/win32/msvc8/makefsdata.vcproj
rename to ports/win32/msvc/makefsdata.vcproj
index 4546e73..1b1f6a1 100644
--- a/ports/win32/msvc8/makefsdata.vcproj
+++ b/ports/win32/msvc/makefsdata.vcproj
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9,00"
 	Name="makefsdata"
 	ProjectGUID="{0BFC0F21-8E84-4E68-A9E1-CE2A09B72F6D}"
 	RootNamespace="makefsdata"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -64,6 +65,8 @@
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -140,6 +143,8 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
 			<Tool
diff --git a/ports/win32/msvc8/readme.txt b/ports/win32/msvc/readme.txt
similarity index 100%
rename from ports/win32/msvc8/readme.txt
rename to ports/win32/msvc/readme.txt