diff --git a/.github/locker.yml b/.github/locker.yml
new file mode 100644
index 00000000000..b818a3e47be
--- /dev/null
+++ b/.github/locker.yml
@@ -0,0 +1,4 @@
+{
+    daysAfterClose: 45,
+    perform: true
+}
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f9252a904ba..7740d52f8be 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -22,28 +22,28 @@ File a single issue per problem and feature request.
 * Do not enumerate multiple bugs or feature requests in the same issue.
 * Do not add your issue as a comment to an existing issue unless it's for the identical input. Many issues look similar, but have different causes.
 
-The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix. 
+The more information you can provide, the more likely someone will be successful reproducing the issue and finding a fix.
 
-Please include the following with each issue. 
+Please include the following with each issue.
 
 * Version of VS Code
-* List of extensions that you have installed. 
+* List of extensions that you have installed.
 
-> **Tip:** You can easily add the list of extensions by creating the issue using `Report Issues` from VS Code's Help menu. 
+> **Tip:** You can easily add the list of extensions by creating the issue using `Report Issues` from VS Code's Help menu.
 
-* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw. 
-* Images, animations, or a link to a video. 
-* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue. 
+* Reproducible steps (1... 2... 3...) and what you expected versus what you actually saw.
+* Images, animations, or a link to a video.
+* A code snippet that demonstrates the issue or a link to a code repository we can easily pull down onto our machine to recreate the issue.
 
-> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient. 
+> **Note:** Because we need to copy and paste the code snippet, including a code snippet as a media file (i.e. .gif) is not sufficient.
 
 * Errors in the Dev Tools Console (Help | Toggle Developer Tools)
 
 Please remember to do the following:
 
-* Search the issue repository to see if there exists a duplicate. 
-* Recreate the issue after disabling all extensions (see the [docs for how to do this](https://code.visualstudio.com/docs/editor/extension-gallery#_disable-an-extension)). If you find the issue is caused by an extension you have installed please file an issue on the extension respectively. 
-* Simplify your code around the issue so we can better isolate the problem. 
+* Search the issue repository to see if there exists a duplicate.
+* Recreate the issue after disabling all extensions (see the [docs for how to do this](https://code.visualstudio.com/docs/editor/extension-gallery#_disable-an-extension)). If you find the issue is caused by an extension you have installed please file an issue on the extension respectively.
+* Simplify your code around the issue so we can better isolate the problem.
 
 Don't feel bad if we can't reproduce the issue and ask for more information!
 
@@ -52,3 +52,11 @@ Finally, this is our [issue tracking](https://github.com/Microsoft/vscode/wiki/I
 ## Contributing Fixes
 If you are interested in fixing issues and contributing directly to the code base,
 please see the document [How to Contribute](https://github.com/Microsoft/vscode/wiki/How-to-Contribute).
+
+## Automated Issue Management
+We use a bot to help us manage issues. This bot currently:
+
+* Automatically closes any issue marked `needs-more-info` if there has been no response in past 7 days.
+* Automatically locks 45 days after they are closed.
+
+If you believe the bot got something wrong, please open a new issue and let us know.
\ No newline at end of file