diff --git a/automatic/freecad/freecad.json b/automatic/freecad/freecad.json
index 8f41903851a..072f8042c17 100644
--- a/automatic/freecad/freecad.json
+++ b/automatic/freecad/freecad.json
@@ -1,5 +1,5 @@
 {
     "stable":  "0.20.2.1",
     "portable":  "0.20.2.1",
-    "dev":  "33345.2023.6.15-dev"
+    "dev":  "33345.2023.6.18-dev"
 }
diff --git a/automatic/freecad/freecad.nuspec b/automatic/freecad/freecad.nuspec
index f37a3ef4763..00f3adc111a 100644
--- a/automatic/freecad/freecad.nuspec
+++ b/automatic/freecad/freecad.nuspec
@@ -3,7 +3,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
   <metadata>
     <id>freecad</id>
-    <version>33345.2023.6.15-dev</version>
+    <version>33345.2023.6.18-dev</version>
     <title>FreeCAD</title>
     <owners>chocolatey-community,purity</owners>
     <authors>Jürgen Riegel</authors>
diff --git a/automatic/freecad/tools/chocolateyInstall.ps1 b/automatic/freecad/tools/chocolateyInstall.ps1
index 113f655c9fc..5003561626a 100644
--- a/automatic/freecad/tools/chocolateyInstall.ps1
+++ b/automatic/freecad/tools/chocolateyInstall.ps1
@@ -7,11 +7,11 @@ $packageArgs = @{
   packageName    = 'freecad'
   fileType       = '7z'
   url            = ''
-  url64          = 'https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/FreeCAD_weekly-builds-33345-2023-06-15-conda-Windows-x86_64-py310.7z'
+  url64          = 'https://github.com/FreeCAD/FreeCAD-Bundle/releases/download/weekly-builds/FreeCAD_weekly-builds-33345-2023-06-18-conda-Windows-x86_64-py310.7z'
   softwareName   = 'FreeCAD'
   checksum       = ''
   checksumType   = ''
-  checksum64     = '047599D03B9933D9959A25DC7E31970CEF0BD0AF5C5F91A6A16DB508D91A35A4'
+  checksum64     = '25E3AF0D20FF50DFCE151AE70CFC4F46A6AB8063360C8F0B31B93273061A2FFD'
   checksumType64 = 'sha256'
   silentArgs     = '/S'
   validExitCodes = @(0)
diff --git a/automatic/notepadplusplus.commandline/legal/VERIFICATION.txt b/automatic/notepadplusplus.commandline/legal/VERIFICATION.txt
index 5f17630a22c..f394c516114 100644
--- a/automatic/notepadplusplus.commandline/legal/VERIFICATION.txt
+++ b/automatic/notepadplusplus.commandline/legal/VERIFICATION.txt
@@ -7,15 +7,15 @@ location on <>
 and can be verified by doing the following:
 
 1. Download the following:
-  32-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.3/npp.8.5.3.portable.7z>
-  64-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.3/npp.8.5.3.portable.x64.7z>
+  32-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.4/npp.8.5.4.portable.7z>
+  64-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.4/npp.8.5.4.portable.x64.7z>
 2. Get the checksum using one of the following methods:
   - Using powershell function 'Get-FileHash'
   - Use chocolatey utility 'checksum.exe'
 3. The checksums should match the following:
 
   checksum type: sha256
-  checksum32: 81F88C658BF5E23E607DC98348B648592FF626DD5742266AC15B92A1C00B588D
-  checksum64: B27ACF588AB6810C7FF9184A21EE05C555303E15F86610793292B1721AB478B7
+  checksum32: B0830776309AA68ADC35A65079CAF94EF69F54F024EEE769E4143CA73DBAA0A0
+  checksum64: 0528F0A2D34FE68300C4E4C9AB2FF217411E20441DB182F5854C36A07E25DD43
 
 The file 'LICENSE.txt' has been obtained from <https://github.com/notepad-plus-plus/notepad-plus-plus/blob/f7ade4739ba8d53e87b5cc50bbed1bb472f5e68c/LICENSE>
diff --git a/automatic/notepadplusplus.commandline/notepadplusplus.commandline.nuspec b/automatic/notepadplusplus.commandline/notepadplusplus.commandline.nuspec
index 555fa24c8fa..ca9cb79f24b 100644
--- a/automatic/notepadplusplus.commandline/notepadplusplus.commandline.nuspec
+++ b/automatic/notepadplusplus.commandline/notepadplusplus.commandline.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <id>notepadplusplus.commandline</id>
     <title>Notepad++ (Portable, CommandLine)</title>
-    <version>8.5.3</version>
+    <version>8.5.4</version>
     <authors>Don Ho</authors>
     <owners>chocolatey-community</owners>
     <summary>Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.</summary>
diff --git a/automatic/notepadplusplus.commandline/tools/chocolateyInstall.ps1 b/automatic/notepadplusplus.commandline/tools/chocolateyInstall.ps1
index 74922cb5f9c..c1251b5aac0 100644
--- a/automatic/notepadplusplus.commandline/tools/chocolateyInstall.ps1
+++ b/automatic/notepadplusplus.commandline/tools/chocolateyInstall.ps1
@@ -9,8 +9,8 @@ $toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition
 
 $packageArgs = @{
   packageName = $env:ChocolateyPackageName
-  file        = "$toolsPath\npp.8.5.3.portable.7z"
-  file64      = "$toolsPath\npp.8.5.3.portable.x64.7z"
+  file        = "$toolsPath\npp.8.5.4.portable.7z"
+  file64      = "$toolsPath\npp.8.5.4.portable.x64.7z"
   destination = $toolsPath
 }
 
diff --git a/automatic/notepadplusplus.install/legal/VERIFICATION.txt b/automatic/notepadplusplus.install/legal/VERIFICATION.txt
index ba0b233f1b9..25087ff4954 100644
--- a/automatic/notepadplusplus.install/legal/VERIFICATION.txt
+++ b/automatic/notepadplusplus.install/legal/VERIFICATION.txt
@@ -7,15 +7,15 @@ location on <>
 and can be verified by doing the following:
 
 1. Download the following:
-  32-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.3/npp.8.5.3.Installer.exe>
-  64-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.3/npp.8.5.3.Installer.x64.exe>
+  32-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.4/npp.8.5.4.Installer.exe>
+  64-Bit software: <https://github.com/notepad-plus-plus/notepad-plus-plus/releases/download/v8.5.4/npp.8.5.4.Installer.x64.exe>
 2. Get the checksum using one of the following methods:
   - Using powershell function 'Get-FileHash'
   - Use chocolatey utility 'checksum.exe'
 3. The checksums should match the following:
 
   checksum type: sha256
-  checksum32: 2DF4BB1E9437D1ABE991E5F5B7C3EFA990BE48D0A8954FE560EE2C317C740858
-  checksum64: 90E1C08BEE6B46A41713B1A612ED2B64E647194D9E4E9DF40639D7A8CAE94074
+  checksum32: 5A3B915F1619C671699D08528FE23466CABFCC63D787C44586BC096D8536268F
+  checksum64: 1DF56772594A5EC2F550C7727A4879142736106DA68B5D185C4391E08B48EC5E
 
 The file 'LICENSE.txt' has been obtained from <https://github.com/notepad-plus-plus/notepad-plus-plus/blob/f7ade4739ba8d53e87b5cc50bbed1bb472f5e68c/LICENSE>
diff --git a/automatic/notepadplusplus.install/notepadplusplus.install.nuspec b/automatic/notepadplusplus.install/notepadplusplus.install.nuspec
index ac738450446..b5ba7406291 100644
--- a/automatic/notepadplusplus.install/notepadplusplus.install.nuspec
+++ b/automatic/notepadplusplus.install/notepadplusplus.install.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <id>notepadplusplus.install</id>
     <title>Notepad++ (Install)</title>
-    <version>8.5.3</version>
+    <version>8.5.4</version>
     <authors>Don Ho</authors>
     <owners>chocolatey-community</owners>
     <summary>Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.</summary>
diff --git a/automatic/notepadplusplus.install/tools/chocolateyInstall.ps1 b/automatic/notepadplusplus.install/tools/chocolateyInstall.ps1
index 72361e22968..1c707497014 100644
--- a/automatic/notepadplusplus.install/tools/chocolateyInstall.ps1
+++ b/automatic/notepadplusplus.install/tools/chocolateyInstall.ps1
@@ -21,8 +21,8 @@ $toolsPath = Split-Path -parent $MyInvocation.MyCommand.Definition
 $packageArgs = @{
   packageName    = $env:ChocolateyPackageName
   fileType       = 'exe'
-  file           = "$toolsPath\npp.8.5.3.Installer.exe"
-  file64         = "$toolsPath\npp.8.5.3.Installer.x64.exe"
+  file           = "$toolsPath\npp.8.5.4.Installer.exe"
+  file64         = "$toolsPath\npp.8.5.4.Installer.x64.exe"
   softwareName   = 'Notepad\+\+*'
   silentArgs     = '/S'
   validExitCodes = @(0)
diff --git a/automatic/notepadplusplus/notepadplusplus.nuspec b/automatic/notepadplusplus/notepadplusplus.nuspec
index 10f3cae86bd..6d4d0fad8e4 100644
--- a/automatic/notepadplusplus/notepadplusplus.nuspec
+++ b/automatic/notepadplusplus/notepadplusplus.nuspec
@@ -4,7 +4,7 @@
   <metadata>
     <id>notepadplusplus</id>
     <title>Notepad++</title>
-    <version>8.5.3</version>
+    <version>8.5.4</version>
     <authors>Don Ho</authors>
     <owners>chocolatey-community</owners>
     <summary>Notepad++ is a free (as in "free speech" and also as in "free beer") source code editor and Notepad replacement that supports several languages.</summary>
@@ -44,7 +44,7 @@ Based on the powerful editing component Scintilla, Notepad++ is written in C++ a
     <mailingListUrl>https://notepad-plus-plus.org/community/</mailingListUrl>
     <bugTrackerUrl>https://github.com/notepad-plus-plus/notepad-plus-plus/issues</bugTrackerUrl>
     <dependencies>
-      <dependency id="notepadplusplus.install" version="[8.5.3]" />
+      <dependency id="notepadplusplus.install" version="[8.5.4]" />
     </dependencies>
     <licenseUrl>https://github.com/notepad-plus-plus/notepad-plus-plus/blob/master/LICENSE</licenseUrl>
   </metadata>