diff --git a/README.md b/README.md
index a4ec4b70..c58f1b13 100644
--- a/README.md
+++ b/README.md
@@ -92,6 +92,12 @@ Problem Matchers are a way to scan the output of actions for a specified regex p
 <br/>
 <br/>
 
+:warning: [Proxy Server Support](docs/proxy-support.md)
+
+Self-hosted runners can be configured to run behind proxy servers. 
+<br/>
+<br/>
+
 <h3><a href="https://github.com/actions/hello-world-javascript-action">Hello World JavaScript Action</a></h3>
 
 Illustrates how to create a simple hello world javascript action.
diff --git a/docs/proxy-support.md b/docs/proxy-support.md
new file mode 100644
index 00000000..b00ef0a3
--- /dev/null
+++ b/docs/proxy-support.md
@@ -0,0 +1,10 @@
+# Proxy Server Support
+
+Self-hosted runners [can be configured](https://help.github.com/en/actions/hosting-your-own-runners/using-a-proxy-server-with-self-hosted-runners) to run behind a proxy server in enterprises.
+
+For actions to **just work** behind a proxy server:
+
+  1. Use [tool-cache] version >= 1.3.1
+  2. Optionally use [actions/http-client](https://github.com/actions/http-client)
+
+If you are using other http clients, refer to the [environment variables set by the runner](https://help.github.com/en/actions/hosting-your-own-runners/using-a-proxy-server-with-self-hosted-runners).
\ No newline at end of file