diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38c7bd19de..9680d15056 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+<a name="6.0.0"></a>
+# [6.0.0](https://github.com/akveo/nebular/compare/v5.1.0...v6.0.0) (2020-07-31)
+
+
+### Bug Fixes
+
+* **datepicker:** background and border theming ([#2418](https://github.com/akveo/nebular/issues/2418)) ([381eb00](https://github.com/akveo/nebular/commit/381eb00))
+* **form field:** addon alignment ([#2460](https://github.com/akveo/nebular/issues/2460)) ([dc154ab](https://github.com/akveo/nebular/commit/dc154ab))
+* **nbButton:** allow specifying custom tabindex ([#2452](https://github.com/akveo/nebular/issues/2452)) ([e9f84be](https://github.com/akveo/nebular/commit/e9f84be))
+
+
+### Code Refactoring
+
+* **nb-icon:** return null if icon wasn't found ([#2466](https://github.com/akveo/nebular/issues/2466)) ([4af8924](https://github.com/akveo/nebular/commit/4af8924))
+
+
+### Features
+
+* upgrade to Angular 10 ([#2464](https://github.com/akveo/nebular/issues/2464)) ([540ee46](https://github.com/akveo/nebular/commit/540ee46))
+
+
+### BREAKING CHANGES
+
+* **nb-icon:** `NbIconLibraries.getSvgIcon` and `NbIconLibraries.getIcon` could return null if icon wasn't found and won't throw. As methods don't throw now, you need to handle possible `null` return value.
+* **Angular:** Nebular packages now require Angular 10+. Nebular packages no longer include ESM5 and FESM5 bundles as per Angular Package Format 10.
+* **NbBasePicker**: Angular lifecycle methods moved to `NbBasePickerComponent`. If you use `NbBasePicker` as a base class of your custom picker change it to `NbBasePickerComponent`.
+
 <a name="5.1.0"></a>
 # [5.1.0](https://github.com/akveo/nebular/compare/v5.0.0...v5.1.0) (2020-06-03)
 
diff --git a/docs/versions.json b/docs/versions.json
index 34e1b42508..24fcb66d58 100644
--- a/docs/versions.json
+++ b/docs/versions.json
@@ -1,7 +1,7 @@
 [
   {
-    "checkoutTarget": "4a3cc1a7f7a4c1ddeb577540d40ea0abce72f904",
-    "name": "5.1.0",
+    "checkoutTarget": "v6.0.0",
+    "name": "6.0.0",
     "path": "/nebular/",
     "isCurrent": true
   },
@@ -11,8 +11,8 @@
     "path": "/nebular/next/"
   },
   {
-    "checkoutTarget": "4.6.x",
-    "name": "4.6.0",
-    "path": "/nebular/4.6.0/"
+    "checkoutTarget": "5.1.x",
+    "name": "5.1.x",
+    "path": "/nebular/5.1.x/"
   }
 ]
diff --git a/package-lock.json b/package-lock.json
index d4b28364a4..eaa60c3943 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "nebular",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 60452e5000..f9d3f94bb0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nebular",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "license": "MIT",
   "author": "akveo <contact@akveo.com>",
   "private": true,
diff --git a/packages-smoke/package-lock.json b/packages-smoke/package-lock.json
index 5cc38bfdda..78a8fbe7e6 100644
--- a/packages-smoke/package-lock.json
+++ b/packages-smoke/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "packages-smoke",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/packages-smoke/package.json b/packages-smoke/package.json
index dd34a0e993..3d402a8d66 100644
--- a/packages-smoke/package.json
+++ b/packages-smoke/package.json
@@ -1,6 +1,6 @@
 {
   "name": "packages-smoke",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/framework/auth/package.json b/src/framework/auth/package.json
index ccc8433bf6..94400430b0 100644
--- a/src/framework/auth/package.json
+++ b/src/framework/auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/auth",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/auth",
   "author": "akveo",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "@angular/core": "^10.0.0",
     "@angular/router": "^10.0.0",
     "@angular/forms": "^10.0.0",
-    "@nebular/theme": "5.1.0",
+    "@nebular/theme": "6.0.0",
     "rxjs": "^6.5.1"
   },
   "sideEffects": false
diff --git a/src/framework/bootstrap/package.json b/src/framework/bootstrap/package.json
index a77307926f..b57218f4d7 100644
--- a/src/framework/bootstrap/package.json
+++ b/src/framework/bootstrap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/bootstrap",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/bootstrap",
   "author": "akveo",
   "license": "MIT",
@@ -22,6 +22,6 @@
   ],
   "peerDependencies": {
     "bootstrap": "^4.0.0",
-    "@nebular/theme": "5.1.0"
+    "@nebular/theme": "6.0.0"
   }
 }
diff --git a/src/framework/date-fns/package.json b/src/framework/date-fns/package.json
index ae1e3be1a5..5ee46658dd 100644
--- a/src/framework/date-fns/package.json
+++ b/src/framework/date-fns/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/date-fns",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/date-fns",
   "author": "akveo",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "nebular"
   ],
   "peerDependencies": {
-    "@nebular/theme": "5.1.0",
+    "@nebular/theme": "6.0.0",
     "date-fns": "2"
   },
   "sideEffects": false
diff --git a/src/framework/eva-icons/package.json b/src/framework/eva-icons/package.json
index 6fd87fa04f..f4ac0fc00a 100644
--- a/src/framework/eva-icons/package.json
+++ b/src/framework/eva-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/eva-icons",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/eva-icons",
   "author": "akveo",
   "license": "MIT",
@@ -23,7 +23,7 @@
     "eva-icons"
   ],
   "peerDependencies": {
-    "@nebular/theme": "5.1.0",
+    "@nebular/theme": "6.0.0",
     "eva-icons": "^1.1.2"
   },
   "sideEffects": false
diff --git a/src/framework/firebase-auth/package.json b/src/framework/firebase-auth/package.json
index 18bc01c07e..c16a82d3b9 100644
--- a/src/framework/firebase-auth/package.json
+++ b/src/framework/firebase-auth/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/firebase-auth",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/firebase-auth",
   "author": "akveo",
   "license": "MIT",
@@ -26,7 +26,7 @@
   ],
   "peerDependencies": {
     "@angular/core": "^10.0.0",
-    "@nebular/auth": "5.1.0",
+    "@nebular/auth": "6.0.0",
     "rxjs": "^6.5.1",
     "firebase": "^7.14.5",
     "@angular/fire": "^6.0.0"
diff --git a/src/framework/moment/package.json b/src/framework/moment/package.json
index 5939179036..af5eeef6c4 100644
--- a/src/framework/moment/package.json
+++ b/src/framework/moment/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/moment",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/moment",
   "author": "akveo",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "nebular"
   ],
   "peerDependencies": {
-    "@nebular/theme": "5.1.0",
+    "@nebular/theme": "6.0.0",
     "moment": "^2.22.2"
   },
   "sideEffects": false
diff --git a/src/framework/security/package.json b/src/framework/security/package.json
index 7f226a6699..82901dc1d7 100644
--- a/src/framework/security/package.json
+++ b/src/framework/security/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/security",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/security",
   "author": "akveo",
   "license": "MIT",
diff --git a/src/framework/theme/package.json b/src/framework/theme/package.json
index 20f33fc583..adca490f56 100644
--- a/src/framework/theme/package.json
+++ b/src/framework/theme/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nebular/theme",
-  "version": "5.1.0",
+  "version": "6.0.0",
   "description": "@nebular/theme",
   "author": "akveo",
   "license": "MIT",