diff --git a/web/static/config/manifest.json b/web/static/config/manifest.json
new file mode 100644
index 0000000000..6110122c2f
--- /dev/null
+++ b/web/static/config/manifest.json
@@ -0,0 +1,13 @@
+{
+  "name": "Mattermost",
+  "icons": [
+    {
+      "src": "../static/iamges/icon50x50.gif",
+      "sizes": "50x50",
+      "type": "image/png"
+    }
+  ],
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait"
+}
\ No newline at end of file
diff --git a/web/templates/head.html b/web/templates/head.html
index abcb307007..ead6485713 100644
--- a/web/templates/head.html
+++ b/web/templates/head.html
@@ -5,6 +5,19 @@
 
     <title>{{ .Title }}</title>
 
+    <!-- iOS add to homescreen -->
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-title" content="{{ .Title }}">
+    <meta name="application-name" content="{{ .Title }}">
+    <meta name="format-detection" content="telephone=no">
+    <!-- iOS add to homescreen -->
+
+    <!-- Android add to homescreen -->
+    <link rel="manifest" href="/static/config/manifest.json">
+    <!-- Android add to homescreen -->
+
     <link rel="stylesheet" href="/static/css/bootstrap-3.3.1.min.css">
     <link rel="stylesheet" href="/static/css/jasny-bootstrap.min.css" rel="stylesheet">