diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ad408e81..4a0a34c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [6.5.4](https://github.com/NativeScript/NativeScript/compare/6.5.3...6.5.4) (2020-06-04)
+
+
+### Bug Fixes
+
+* **core:** pin typescript to 3.8.3 to avoid __exportStar issue ([#8612](https://github.com/NativeScript/NativeScript/issues/8612)) ([8931295](https://github.com/NativeScript/NativeScript/commit/8931295ab54e1522848ba4d3986f9ba02926644c))
+
+
+
 ## [6.5.3](https://github.com/NativeScript/NativeScript/compare/6.5.2...6.5.3) (2020-06-04)
 
 
diff --git a/nativescript-core/package.json b/nativescript-core/package.json
index f32361b6c..430aa3559 100644
--- a/nativescript-core/package.json
+++ b/nativescript-core/package.json
@@ -3,7 +3,7 @@
     "main": "index",
     "types": "index.d.ts",
     "description": "Telerik NativeScript Core Modules",
-    "version": "6.5.3",
+    "version": "6.5.4",
     "homepage": "https://www.nativescript.org",
     "repository": {
         "type": "git",
diff --git a/package.json b/package.json
index ade8906bd..cfa0538de 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "NativeScript",
   "description": "Telerik NativeScript Core Modules",
   "homepage": "https://www.nativescript.org",
-  "version": "6.5.3",
+  "version": "6.5.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/NativeScript/NativeScript"
diff --git a/tns-core-modules-package/package.json b/tns-core-modules-package/package.json
index e357f8603..769acee8b 100644
--- a/tns-core-modules-package/package.json
+++ b/tns-core-modules-package/package.json
@@ -3,7 +3,7 @@
     "main": "index",
     "types": "index.d.ts",
     "description": "Telerik NativeScript Core Modules",
-    "version": "6.5.3",
+    "version": "6.5.4",
     "homepage": "https://www.nativescript.org",
     "repository": {
         "type": "git",
diff --git a/tns-core-modules-widgets/package.json b/tns-core-modules-widgets/package.json
index 7bcc0c201..91ef762a9 100644
--- a/tns-core-modules-widgets/package.json
+++ b/tns-core-modules-widgets/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tns-core-modules-widgets",
-    "version": "6.5.3",
+    "version": "6.5.4",
     "description": "Native widgets used in the NativeScript framework.",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1"
@@ -21,4 +21,4 @@
             "android": "6.0.0"
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tns-platform-declarations/package.json b/tns-platform-declarations/package.json
index fa820bf76..64eda0246 100644
--- a/tns-platform-declarations/package.json
+++ b/tns-platform-declarations/package.json
@@ -1,6 +1,6 @@
 {
     "name": "tns-platform-declarations",
-    "version": "6.5.3",
+    "version": "6.5.4",
     "description": "Platform-specific TypeScript declarations for NativeScript for accessing native objects",
     "main": "",
     "scripts": {