diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0aec157050..ba754c9ad8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ NativeScript CLI Changelog
 
 * [Fixed #5187](https://github.com/NativeScript/nativescript-cli/issues/5187): Inaccessible native source code without modulemap
 * [Fixed #5239](https://github.com/NativeScript/nativescript-cli/issues/5239): Temporary files created by CLI are not deleted in some cases
+* [Fixed #5242](https://github.com/NativeScript/nativescript-cli/issues/5242): Java 13 is not supported, but doctor does not detect it
 
 
 6.3.3 (2020, January 13)
diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 400806a91c..b86b4a63af 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2619,7 +2619,8 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -2637,11 +2638,13 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2654,15 +2657,18 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -2765,7 +2771,8 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -2775,6 +2782,7 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -2787,17 +2795,20 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2814,6 +2825,7 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2886,7 +2898,8 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -2896,6 +2909,7 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -2971,7 +2985,8 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -3001,6 +3016,7 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -3018,6 +3034,7 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -3056,11 +3073,13 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true
+          "bundled": true,
+          "optional": true
         }
       }
     },
@@ -5445,13 +5464,14 @@
       }
     },
     "nativescript-doctor": {
-      "version": "1.12.0",
-      "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-1.12.0.tgz",
-      "integrity": "sha512-jUZoCNV3wtuDKBnKUFdWiCsPNgNeDSn4RN+xWdzRYDeB4MrNdeEGX6Vl9WbjHTkPi3QgXWw1chjsomkYvzjS3g==",
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/nativescript-doctor/-/nativescript-doctor-1.13.0.tgz",
+      "integrity": "sha512-JvxXeFE+E4s9ia7qh9KO5rPUY0TzQoT5XAf23vOdn2ELZAb5yRjUdw68WvzwxCogt+vRcnr7KSRybPx3YBeEGw==",
       "requires": {
         "lodash": "4.17.15",
         "osenv": "0.1.3",
         "semver": "5.5.1",
+        "shelljs": "0.7.6",
         "temp": "0.8.3",
         "winreg": "1.2.2",
         "yauzl": "2.10.0"
@@ -8389,4 +8409,4 @@
       "integrity": "sha512-99p+ohUBZ2Es0AXrw/tpazMcJ0/acpdQXr0UPrVWF0p7i8XiOYvjiXTdwXUVCTPopBGCSDtWBzOoYNPtF3z/8w=="
     }
   }
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index 3f42f9ae0d..d8c9135c4e 100644
--- a/package.json
+++ b/package.json
@@ -60,7 +60,7 @@
     "mkdirp": "0.5.1",
     "mute-stream": "0.0.5",
     "nativescript-dev-xcode": "0.2.1",
-    "nativescript-doctor": "1.12.0",
+    "nativescript-doctor": "1.13.0",
     "nativescript-preview-sdk": "0.3.4",
     "open": "6.0.0",
     "ora": "2.0.0",
@@ -141,4 +141,4 @@
   "engines": {
     "node": ">=10.0.0 <14.0.0"
   }
-}
\ No newline at end of file
+}