diff --git a/CHANGELOG.md b/CHANGELOG.md
index 983269bde06d..51614a3ba36e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,21 @@
 # Release notes
 
 ## [Unreleased (daily channel)](https://github.com/invoiceninja/invoiceninja/tree/v5-develop)
+
+## [v5.2.0-release](https://github.com/invoiceninja/invoiceninja/releases/tag/v5.2.0-release)
+## Added:
+- Timezone Offset: Schedule emails based on timezone and time offsets.
+- Force client country to system country if none is set.
+- GMail Oauth via web
+
+## Fixed:
 - Add Cache-control: no-cache to prevent overaggressive caching of assets
 - Improved labelling in the settings (client portal)
 - Client portal: Multiple accounts access improvements (#5703)
 - Client portal: "Credits" updates (#5734)
 - Client portal: Make sidebar white color, in order to make logo displaying more simple. (#5753)
+- Inject small delay into emails to allow all resources to be produced (ie PDFs) prior to sending
+- Fixes for endless reminders not firing
 
 ## [v5.1.56-release](https://github.com/invoiceninja/invoiceninja/releases/tag/v5.1.56-release)
 ## Fixed:
diff --git a/VERSION.txt b/VERSION.txt
index b24ea85a7dea..7cbea073bea1 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-5.1.74
\ No newline at end of file
+5.2.0
\ No newline at end of file
diff --git a/app/Models/Client.php b/app/Models/Client.php
index f3f3fa374aad..732a70123c7e 100644
--- a/app/Models/Client.php
+++ b/app/Models/Client.php
@@ -698,6 +698,8 @@ class Client extends BaseModel implements HasLocalePreference
 
     public function timezone_offset()
     {
+        $offset = 0;
+
         $entity_send_time = $this->getSetting('entity_send_time');
 
         if($entity_send_time == 0)
@@ -705,7 +707,8 @@ class Client extends BaseModel implements HasLocalePreference
 
         $timezone = $this->company->timezone();
 
-        $offset = $timezone->utc_offset + ($entity_send_time * 3600);
+        $offset -= $timezone->utc_offset;
+        $offset += ($entity_send_time * 3600);
 
         return $offset;
     }
diff --git a/config/ninja.php b/config/ninja.php
index 87c25c632bb3..127bbf08196b 100644
--- a/config/ninja.php
+++ b/config/ninja.php
@@ -14,8 +14,8 @@ return [
     'require_https' => env('REQUIRE_HTTPS', true),
     'app_url' => rtrim(env('APP_URL', ''), '/'),
     'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
-    'app_version' => '5.1.74',
-    'app_tag' => '5.1.74-release',
+    'app_version' => '5.2.0',
+    'app_tag' => '5.2.0-release',
     'minimum_client_version' => '5.0.16',
     'terms_version' => '1.0.1',
     'api_secret' => env('API_SECRET', ''),