diff --git a/ports/ngspice/CONTROL b/ports/ngspice/CONTROL
deleted file mode 100644
index 545e117b05..0000000000
--- a/ports/ngspice/CONTROL
+++ /dev/null
@@ -1,10 +0,0 @@
-Source: ngspice
-Version: 34
-Port-Version: 1
-Homepage: http://ngspice.sourceforge.net/
-Description: Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE
-Supports: !(linux|osx|arm|uwp)
-Default-Features: codemodels
-
-Feature: codemodels
-Description: Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources.
diff --git a/ports/ngspice/portfile.cmake b/ports/ngspice/portfile.cmake
index 915d120bd2..e128d737ec 100644
--- a/ports/ngspice/portfile.cmake
+++ b/ports/ngspice/portfile.cmake
@@ -8,12 +8,15 @@ set(VCPKG_CRT_LINKAGE static)
 vcpkg_from_sourceforge(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ngspice/ng-spice-rework
-    REF 34
-    FILENAME "ngspice-34.tar.gz"
-    SHA512 5e90727f3f6b8675b83f71e1961d33cd498081a7f3bea5d081521f12ecb3979775159f083f84a5856233529505262c399f75d305758af51894a1245603476cf8
+    REF 35
+    FILENAME "ngspice-35.tar.gz"
+    SHA512 2f9b0f951e3ca8d52692beadb895b352311f67b8760f99d0e2f4718fce4b497dd68e2b933029eeacb4ed57551e959bc6e3747e64feb4722a4f841e734f5a664b
     PATCHES
         use-winbison-sharedspice.patch
         use-winbison-vngspice.patch
+        remove-post-build.patch
+        remove-64-in-codemodel-name.patch
+
 )
 
 vcpkg_find_acquire_program(BISON)
@@ -49,8 +52,6 @@ if("codemodels" IN_LIST FEATURES)
 
     vcpkg_build_msbuild(
         PROJECT_PATH ${BUILDTREE_PATH}/visualc/vngspice.sln
-        INCLUDES_SUBPATH /src/include
-        LICENSE_SUBPATH COPYING
         # build_msbuild swaps x86 for win32(bad) if we dont force our own setting
         PLATFORM ${TRIPLET_SYSTEM_ARCH}
         TARGET Build
diff --git a/ports/ngspice/remove-64-in-codemodel-name.patch b/ports/ngspice/remove-64-in-codemodel-name.patch
new file mode 100644
index 0000000000..eb5e774b65
--- /dev/null
+++ b/ports/ngspice/remove-64-in-codemodel-name.patch
@@ -0,0 +1,131 @@
+From dc6b6c0aa4205047e9fd052c401f3f357d83ef57 Mon Sep 17 00:00:00 2001
+From: Marek Roszko <mark.roszko@gmail.com>
+Date: Thu, 12 Aug 2021 22:26:43 -0400
+Subject: [PATCH] Remove 64 in filename output of codemodels
+
+---
+ visualc/xspice/analog.vcxproj     | 4 ++--
+ visualc/xspice/digital.vcxproj    | 4 ++--
+ visualc/xspice/spice2poly.vcxproj | 4 ++--
+ visualc/xspice/table.vcxproj      | 4 ++--
+ visualc/xspice/xtradev.vcxproj    | 4 ++--
+ visualc/xspice/xtraevt.vcxproj    | 4 ++--
+ 6 files changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/visualc/xspice/analog.vcxproj b/visualc/xspice/analog.vcxproj
+index cf65a37..8b320ce 100644
+--- a/visualc/xspice/analog.vcxproj
++++ b/visualc/xspice/analog.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/digital.vcxproj b/visualc/xspice/digital.vcxproj
+index 87f4802..7722ce6 100644
+--- a/visualc/xspice/digital.vcxproj
++++ b/visualc/xspice/digital.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/spice2poly.vcxproj b/visualc/xspice/spice2poly.vcxproj
+index c92471b..786ff7e 100644
+--- a/visualc/xspice/spice2poly.vcxproj
++++ b/visualc/xspice/spice2poly.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/table.vcxproj b/visualc/xspice/table.vcxproj
+index fb4791c..ad3ee03 100644
+--- a/visualc/xspice/table.vcxproj
++++ b/visualc/xspice/table.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/xtradev.vcxproj b/visualc/xspice/xtradev.vcxproj
+index 6f0197f..53975b0 100644
+--- a/visualc/xspice/xtradev.vcxproj
++++ b/visualc/xspice/xtradev.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+diff --git a/visualc/xspice/xtraevt.vcxproj b/visualc/xspice/xtraevt.vcxproj
+index d5741e7..3177a91 100644
+--- a/visualc/xspice/xtraevt.vcxproj
++++ b/visualc/xspice/xtraevt.vcxproj
+@@ -77,12 +77,12 @@
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>true</GenerateManifest>
+     <LinkIncremental>false</LinkIncremental>
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+-    <TargetName>$(ProjectName)64</TargetName>
++    <TargetName>$(ProjectName)</TargetName>
+     <GenerateManifest>false</GenerateManifest>
+   </PropertyGroup>
+   <ItemDefinitionGroup>
+-- 
+2.32.0.windows.2
+
diff --git a/ports/ngspice/remove-post-build.patch b/ports/ngspice/remove-post-build.patch
new file mode 100644
index 0000000000..2a9d40b94f
--- /dev/null
+++ b/ports/ngspice/remove-post-build.patch
@@ -0,0 +1,230 @@
+From 363737b9e0e5c2f9de85a0caf641204e638115e3 Mon Sep 17 00:00:00 2001
+From: Marek Roszko <mark.roszko@gmail.com>
+Date: Thu, 12 Aug 2021 22:09:34 -0400
+Subject: [PATCH] Remove post build events that copy files out of the tree
+
+---
+ visualc/vngspice-fftw.vcxproj | 24 ------------------------
+ visualc/vngspice.vcxproj      | 17 +++++------------
+ 2 files changed, 5 insertions(+), 36 deletions(-)
+
+diff --git a/visualc/vngspice-fftw.vcxproj b/visualc/vngspice-fftw.vcxproj
+index 14773c8..178aa73 100644
+--- a/visualc/vngspice-fftw.vcxproj
++++ b/visualc/vngspice-fftw.vcxproj
+@@ -238,8 +238,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspiced.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -289,8 +287,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -337,8 +333,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspiced.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -393,8 +387,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -438,8 +430,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspiced.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -489,8 +479,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -537,8 +525,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspiced.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -591,8 +577,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -643,8 +627,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -700,8 +682,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -752,8 +732,6 @@ lib /machine:x86 /def:..\..\fftw-3.3-dll32\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll32\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+@@ -807,8 +785,6 @@ lib /machine:x64 /def:..\..\fftw-3.3-dll64\libfftw3-3.def /out:$(IntDir)libfftw3
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      copy /y "..\..\fftw-3.3-dll64\libfftw3-3.dll" "$(OutDir)"
+-      make-install-vngspice.bat $(OutDir) fftw 64
+       </Command>
+     </PostBuildEvent>
+   </ItemDefinitionGroup>
+diff --git a/visualc/vngspice.vcxproj b/visualc/vngspice.vcxproj
+index 7b6ac0b..7190c1e 100644
+--- a/visualc/vngspice.vcxproj
++++ b/visualc/vngspice.vcxproj
+@@ -242,7 +242,7 @@
+       <LargeAddressAware>true</LargeAddressAware>
+     </Link>
+     <PostBuildEvent>
+-      <Command>make-install-vngspiced.bat $(OutDir)</Command>
++      <Command></Command>
+     </PostBuildEvent>
+     <Manifest>
+       <AdditionalManifestFiles>$(ProjectDir)ngspice-x86.exe.manifest</AdditionalManifestFiles>
+@@ -293,7 +293,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspice.bat $(OutDir)
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -342,7 +341,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspiced.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -399,7 +397,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspice.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -444,7 +441,7 @@
+       <LargeAddressAware>true</LargeAddressAware>
+     </Link>
+     <PostBuildEvent>
+-      <Command>make-install-vngspiced.bat $(OutDir)</Command>
++      <Command></Command>
+     </PostBuildEvent>
+     <Manifest>
+       <AdditionalManifestFiles>$(ProjectDir)ngspice-x86.exe.manifest</AdditionalManifestFiles>
+@@ -494,7 +491,7 @@
+       <LargeAddressAware>true</LargeAddressAware>
+     </Link>
+     <PostBuildEvent>
+-      <Command>make-install-vngspice.bat $(OutDir)</Command>
++      <Command></Command>
+     </PostBuildEvent>
+     <Manifest>
+       <AdditionalManifestFiles>$(ProjectDir)ngspice-x86.exe.manifest</AdditionalManifestFiles>
+@@ -542,7 +539,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspiced.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -597,7 +593,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspice.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -649,7 +644,7 @@
+       <LargeAddressAware>true</LargeAddressAware>
+     </Link>
+     <PostBuildEvent>
+-      <Command>make-install-vngspice.bat $(OutDir)</Command>
++      <Command></Command>
+     </PostBuildEvent>
+     <Manifest>
+       <AdditionalManifestFiles>$(ProjectDir)ngspice-x86.exe.manifest</AdditionalManifestFiles>
+@@ -706,7 +701,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspice.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+@@ -758,7 +752,7 @@
+       <LargeAddressAware>true</LargeAddressAware>
+     </Link>
+     <PostBuildEvent>
+-      <Command>make-install-vngspice.bat $(OutDir)</Command>
++      <Command></Command>
+     </PostBuildEvent>
+     <Manifest>
+       <AdditionalManifestFiles>$(ProjectDir)ngspice-x86.exe.manifest</AdditionalManifestFiles>
+@@ -813,7 +807,6 @@
+     </Link>
+     <PostBuildEvent>
+       <Command>
+-      make-install-vngspice.bat $(OutDir) 64
+       </Command>
+     </PostBuildEvent>
+     <Manifest>
+-- 
+2.32.0.windows.2
+
diff --git a/ports/ngspice/vcpkg.json b/ports/ngspice/vcpkg.json
new file mode 100644
index 0000000000..1b6da85d15
--- /dev/null
+++ b/ports/ngspice/vcpkg.json
@@ -0,0 +1,15 @@
+{
+  "name": "ngspice",
+  "version-string": "35",
+  "description": "Ngspice is a mixed-level/mixed-signal electronic circuit simulator. It is a successor of the latest stable release of Berkeley SPICE",
+  "homepage": "http://ngspice.sourceforge.net/",
+  "supports": "!(linux | osx | arm | uwp)",
+  "default-features": [
+    "codemodels"
+  ],
+  "features": {
+    "codemodels": {
+      "description": "Adds optional code models for XSPICE, ADMS (verilog integration) and B-/E-/G- sources."
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 60a027f1ab..defa9d78ad 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4413,8 +4413,8 @@
       "port-version": 0
     },
     "ngspice": {
-      "baseline": "34",
-      "port-version": 1
+      "baseline": "35",
+      "port-version": 0
     },
     "nifticlib": {
       "baseline": "2020-04-30",
diff --git a/versions/n-/ngspice.json b/versions/n-/ngspice.json
index f7d4016c98..e5ae9654dd 100644
--- a/versions/n-/ngspice.json
+++ b/versions/n-/ngspice.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "cce657d55082d7a23496c44cb311e208ea31cab4",
+      "version-string": "35",
+      "port-version": 0
+    },
     {
       "git-tree": "249a0e9bafd17932e3d46a0f979a2983b8a78b0d",
       "version-string": "34",