diff --git a/ChangeLog b/ChangeLog
index 7ec1f8506..40beafa16 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-09-08 Holger Vogt
+ * visualc/include/config.h, vngspice.sln, vngspice.vcproj:
+   prepare for ngspice22
+
 2010-09-07  Robert Larice
  * src/frontend/parse.c ,
  * src/include/fteparse.h ,
diff --git a/visualc/include/config.h b/visualc/include/config.h
index f3a6ec8ab..0bf46f63c 100644
--- a/visualc/include/config.h
+++ b/visualc/include/config.h
@@ -448,7 +448,7 @@
 #define NGSPICEBINDIR "C:/Spice/bin"
 
 /* Define the build date */
-#define NGSPICEBUILDDATE "Sat Jun 12 17:01:55 GMT 2010"
+#define NGSPICEBUILDDATE "Mon Sep 06 23:06:55 GMT 2010"
 
 /* Define the directory for architecture independent data files */
 #define NGSPICEDATADIR "C:/Spice/share/ngspice"
@@ -472,13 +472,13 @@
 #define PACKAGE_NAME "ngspice"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ngspice 21plus"
+#define PACKAGE_STRING "ngspice 22"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "ngspice"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "21plus"
+#define PACKAGE_VERSION "22"
 
 /* Define if we want predictor algorithm */
 /* #undef PREDICTOR */
@@ -533,7 +533,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "21"
+#define VERSION "22"
 
 /* Define if we want spice2 sensitivity analysis */
 /* #undef WANT_SENSE2 */
diff --git a/visualc/vngspice.sln b/visualc/vngspice.sln
index d03c9317a..09d8993fc 100644
--- a/visualc/vngspice.sln
+++ b/visualc/vngspice.sln
@@ -41,4 +41,7 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		AMDCaProjectFile = D:\Spice_general\ng-spice-rework\visualc\CodeAnalyst\vngspice.caw
+	EndGlobalSection
 EndGlobal
diff --git a/visualc/vngspice.vcproj b/visualc/vngspice.vcproj
index 7e0c93b97..cbc479627 100644
--- a/visualc/vngspice.vcproj
+++ b/visualc/vngspice.vcproj
@@ -55,6 +55,7 @@
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="1"
 				RuntimeTypeInfo="false"
+				OpenMP="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="4"
 				Detect64BitPortabilityProblems="false"
@@ -231,12 +232,13 @@
 				FavorSizeOrSpeed="1"
 				WholeProgramOptimization="true"
 				AdditionalIncludeDirectories=""$(ProjectDir)..\src\maths\poly";"$(ProjectDir)..\src\frontend";"$(ProjectDir)..\src\spicelib\devices";"$(ProjectDir)..\src\include";"$(ProjectDir)include""
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;SIMULATOR;USE_OMP"
 				MinimalRebuild="false"
 				ExceptionHandling="1"
 				BasicRuntimeChecks="0"
 				RuntimeLibrary="0"
 				RuntimeTypeInfo="true"
+				OpenMP="true"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
@@ -2800,6 +2802,10 @@
 				RelativePath="..\src\spicelib\devices\txl\txlitf.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\include\typedefs.h"
+				>
+			</File>
 			<File
 				RelativePath="..\src\frontend\typesdef.h"
 				>