diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index b3c7ca7c1d6..54ce362d8e7 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -220,19 +220,25 @@ function init() {
         console.log();
       } else {
         const useYarn = isUsingYarn();
+        let yarnInfo;
+        if (useYarn) {
+          yarnInfo = checkYarnVersion();
+        }
+
         createApp(
           projectName,
           program.verbose,
           program.scriptsVersion,
           program.template,
           useYarn,
+          yarnInfo,
           program.usePnp
         );
       }
     });
 }
 
-function createApp(name, verbose, version, template, useYarn, usePnp) {
+function createApp(name, verbose, version, template, useYarn, yarnInfo, usePnp) {
   const unsupportedNodeVersion = !semver.satisfies(
     // Coerce strings with metadata (i.e. `15.0.0-nightly`).
     semver.coerce(process.version),
@@ -268,6 +274,11 @@ function createApp(name, verbose, version, template, useYarn, usePnp) {
     version: '0.1.0',
     private: true,
   };
+
+  if (yarnInfo.hasMaxYarnPnp) {
+    packageJson.packageManager = `yarn@${yarnInfo.yarnVersion}`;
+  }
+
   fs.writeFileSync(
     path.join(root, 'package.json'),
     JSON.stringify(packageJson, null, 2) + os.EOL
@@ -294,7 +305,6 @@ function createApp(name, verbose, version, template, useYarn, usePnp) {
       version = 'react-scripts@0.9.x';
     }
   } else if (usePnp) {
-    const yarnInfo = checkYarnVersion();
     if (yarnInfo.yarnVersion) {
       if (!yarnInfo.hasMinYarnPnp) {
         console.log(
@@ -762,10 +772,14 @@ function checkYarnVersion() {
   let hasMaxYarnPnp = false;
   let yarnVersion = null;
   try {
-    yarnVersion = execSync('yarnpkg --version').toString().trim();
+    const userAgentMatches = (process.env.npm_config_user_agent || '').match('yarn/([^ ]+)');
+    yarnVersion = userAgentMatches ? userAgentMatches[1] : null;
+    if (!yarnVersion) {
+      yarnVersion = execSync('yarnpkg --version').toString().trim();
+    }
     if (semver.valid(yarnVersion)) {
       hasMinYarnPnp = semver.gte(yarnVersion, minYarnPnp);
-      hasMaxYarnPnp = semver.lt(yarnVersion, maxYarnPnp);
+      hasMaxYarnPnp = semver.gte(yarnVersion, maxYarnPnp);
     } else {
       // Handle non-semver compliant yarn version strings, which yarn currently
       // uses for nightly builds. The regex truncates anything after the first
@@ -774,7 +788,7 @@ function checkYarnVersion() {
       if (trimmedYarnVersionMatch) {
         const trimmedYarnVersion = trimmedYarnVersionMatch.pop();
         hasMinYarnPnp = semver.gte(trimmedYarnVersion, minYarnPnp);
-        hasMaxYarnPnp = semver.lt(trimmedYarnVersion, maxYarnPnp);
+        hasMaxYarnPnp = semver.gte(trimmedYarnVersion, maxYarnPnp);
       }
     }
   } catch (err) {