diff --git a/Dockerrun.aws.json b/Dockerrun.aws.json
new file mode 100644
index 00000000..98db17e9
--- /dev/null
+++ b/Dockerrun.aws.json
@@ -0,0 +1,60 @@
+{
+    "AWSEBDockerrunVersion": "2",
+    "volumes": [
+        {
+            "name": "app-config",
+            "host": {
+                "sourcePath": "/var/app/current/app/mattermost/config"
+            }
+        },
+        {
+            "name": "app-data",
+            "host": {
+                "sourcePath": "/var/app/current/app/mattermost/data"
+            }
+        },
+        {
+            "name": "db-data",
+            "host": {
+                "sourcePath": "/var/app/current/db/mattermost/var/lib/postgresql/data"
+            }
+        }
+    ],
+    "containerDefinitions": [
+        {
+            "name": "app",
+            "image": "npcode/mattermost-app:latest",
+            "memory": 128,
+            "mountPoints": [
+                {
+                    "sourceVolume": "app-config",
+                    "containerPath": "/mattermost/config"
+                },
+                {
+                    "sourceVolume": "app-data",
+                    "containerPath": "/mattermost/data"
+                }
+            ],
+            "portMappings": [
+                {
+                    "hostPort": 80,
+                    "containerPort": 80
+                }
+            ],
+            "links": [
+                "db"
+            ]
+        },
+        {
+            "name": "db",
+            "image": "npcode/mattermost-db:latest",
+            "memory": 128,
+            "mountPoints": [
+                {
+                    "sourceVolume": "db-data",
+                    "containerPath": "/var/lib/postgresql/data"
+                }
+            ]
+        }
+    ]
+}
diff --git a/README.aws.md b/README.aws.md
new file mode 100644
index 00000000..2a0a8678
--- /dev/null
+++ b/README.aws.md
@@ -0,0 +1,13 @@
+## Installation on AWS Elastic Beanstalk
+
+### Requirement
+
+* [The EB CLI](http://docs.aws.amazon.com/elasticbeanstalk/latest/dg/eb-cli3.html)
+
+### Install
+
+```
+eb init
+eb create prod
+eb open prod
+```
diff --git a/README.md b/README.md
index 7275cfc4..0122a03a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 Dockerfiles for Mattermost in production
 
+See [README.aws.md](./README.aws.md) if you want to install it on AWS Elastic Beanstalk.
+
 ## Requirements
 
 * [docker]