diff --git a/.github/lock.yml b/.github/lock.yml
new file mode 100644
index 00000000000..4b055fd8e69
--- /dev/null
+++ b/.github/lock.yml
@@ -0,0 +1,18 @@
+# Configuration for lock-threads - https://github.com/dessant/lock-threads
+
+# Number of days of inactivity before a closed issue or pull request is locked
+daysUntilLock: 7
+setLockReason: false
+
+issues:
+  # Comment to post when locking a stale Issue.
+  lockComment: >
+    The conversation for this issue has been locked because the issue is
+    closed. If you would like to contribute please open a new issue.
+
+pulls:
+# Comment to post when locking a stale Pull Request.
+  lockComment: >
+    The conversation for this pull request has been locked because the pull
+    request is closed. If you would like to contribute please open a new pull
+    request.
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 00000000000..bf7234bcd07
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,50 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before a stale Issue or Pull Request is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - "issue: proposal"
+  - "issue: announcement"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: true
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: true
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+issues:
+  # Comment to post when marking Issues as stale.
+  markComment: >
+    This issue has been automatically marked as stale because it has not had any
+    recent activity. It will be closed in 7 days if no further activity occurs.
+
+  # Comment to post when closing a stale Issue.
+  closeComment: >
+    This issue has been automatically closed because it has not had any recent
+    activity. The conversation will be locked in 7 days unless the issue is
+    reopened.
+
+pulls:
+  # Comment to post when marking Pull Request as stale.
+  markComment: >
+    This pull request has been automatically marked as stale because it has not
+    had any recent activity. It will be closed in 7 days if no further activity
+    occurs.
+
+  # Comment to post when closing a stale Pull Request.
+  closeComment: >
+    This pull request has been automatically closed because it has not had any
+    recent activity. The conversation will be locked in 7 days unless the pull
+    request is reopened. Thank you for your contribution.
diff --git a/packages/create-react-app/package.json b/packages/create-react-app/package.json
index 3663ba510cb..b9f14f27706 100644
--- a/packages/create-react-app/package.json
+++ b/packages/create-react-app/package.json
@@ -25,7 +25,7 @@
     "chalk": "1.1.3",
     "commander": "2.18.0",
     "cross-spawn": "4.0.2",
-    "envinfo": "5.10.0",
+    "envinfo": "5.11.1",
     "fs-extra": "5.0.0",
     "hyperquest": "2.1.3",
     "semver": "5.5.1",