diff --git a/doc/31-Changelog.md b/doc/31-Changelog.md
index 2d12a1c..6ac5230 100644
--- a/doc/31-Changelog.md
+++ b/doc/31-Changelog.md
@@ -17,6 +17,7 @@ Released closed milestones can be found on [GitHub](https://github.com/Icinga/ic
 * [#229](https://github.com/Icinga/icinga-powershell-framework/pull/229) CustomFields defined as `SecureString` are now set to `hidden` within the Icinga Director configuration basket - please read the [upgrading docs](30-upgrading-framework.md) carefully
 * [#234](https://github.com/Icinga/icinga-powershell-framework/pull/234) Adds support to allow custom exception lists for Icinga Exceptions, making it easier for different modules to ship their own exception messages
 * [#235](https://github.com/Icinga/icinga-powershell-framework/pull/235) Adds new Cmdlet `Show-IcingaEventLogAnalysis` to get a better overview on how many log entries are present within the EventLog based on hour, minute and day average/maximum for allowing a more dynamic configuration for `Invoke-IcingaCheckEventLog`
+* [#236](https://github.com/Icinga/icinga-powershell-framework/pull/236) Adds feature which stops the Icinga Agent before upgrading the Icinga PowerShell Framework and starting it again afterwards (in case it was running), to resolve some possible file lock issues
 * [#241](https://github.com/Icinga/icinga-powershell-framework/pull/241) Ensures we use TLS 1.1 and 1.2 for REST-Api calls, as used certificates in general are created with these
 * [#243](https://github.com/Icinga/icinga-powershell-framework/pull/243) Adds stacktrace output for exceptions in case plugin execution fails
 * [#248](https://github.com/Icinga/icinga-powershell-framework/pull/248) Improves `Test-IcingaPerformanceCounterCategory` by creating an object for the Performance Counter category provided and checking if it is a valid object instead of relying on the registry which might not contain all categories in the correct language.
diff --git a/lib/core/framework/Install-IcingaFrameworkUpdate.psm1 b/lib/core/framework/Install-IcingaFrameworkUpdate.psm1
index e9c9c27..9596f24 100644
--- a/lib/core/framework/Install-IcingaFrameworkUpdate.psm1
+++ b/lib/core/framework/Install-IcingaFrameworkUpdate.psm1
@@ -53,12 +53,18 @@ function Install-IcingaFrameworkUpdate()
     Write-IcingaConsoleNotice ([string]::Format('Using content of folder "{0}" for updates', $ModuleContent));
 
     $ServiceStatus = (Get-Service 'icingapowershell' -ErrorAction SilentlyContinue).Status;
+    $AgentStatus   = (Get-Service 'icinga2' -ErrorAction SilentlyContinue).Status;
 
     if ($ServiceStatus -eq 'Running') {
         Write-IcingaConsoleNotice 'Stopping Icinga PowerShell service';
         Stop-IcingaService 'icingapowershell';
         Start-Sleep -Seconds 1;
     }
+    if ($AgentStatus -eq 'Running') {
+        Write-IcingaConsoleNotice 'Stopping Icinga Agent service';
+        Stop-IcingaService 'icinga2';
+        Start-Sleep -Seconds 1;
+    }
 
     $ModuleDirectory = (Join-Path -Path $Archive.ModuleRoot -ChildPath $RepositoryName);
 
@@ -104,4 +110,8 @@ function Install-IcingaFrameworkUpdate()
         Write-IcingaConsoleNotice 'Starting Icinga PowerShell service';
         Start-IcingaService 'icingapowershell';
     }
+    if ($AgentStatus -eq 'Running') {
+        Write-IcingaConsoleNotice 'Starting Icinga Agent service';
+        Start-IcingaService 'icinga2';
+    }
 }