diff --git a/angular-cli.json b/angular-cli.json
index e4f229734..d4d5fc560 100644
--- a/angular-cli.json
+++ b/angular-cli.json
@@ -16,7 +16,7 @@
       "test": "test.ts",
       "tsconfig": "tsconfig.json",
       "prefix": "app",
-      "mobile": false,
+      "serviceWorker": true,
       "styles": [
         "main.scss",
         "highlightjs/solarized-light.css",
diff --git a/ngsw-manifest.json b/ngsw-manifest.json
new file mode 100644
index 000000000..3fc031783
--- /dev/null
+++ b/ngsw-manifest.json
@@ -0,0 +1,10 @@
+{
+  "external": {
+    "urls": [
+      {"url": "https://fonts.googleapis.com/icon?family=Material+Icons"},
+      {"url": "https://fonts.googleapis.com/css?family=Roboto|Roboto+Mono"},
+      {"url": "https://ajax.googleapis.com/ajax/libs/hammerjs/2.0.8/hammer.min.js"},
+      {"url": "https://cdnjs.cloudflare.com/ajax/libs/web-animations/2.2.5/web-animations.min.js"}
+    ]
+  }
+}
diff --git a/package.json b/package.json
index 5cff08ee7..6e0301f87 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,9 @@
     "test": "ng test",
     "pree2e": "webdriver-manager update",
     "e2e": "protractor",
+    "fetch-local": "bash ./tools/fetch-assets-local.sh",
     "build-themes": "bash ./tools/build-themes.sh",
-    "prod-build": "npm run build-themes && ng build --aot --prod && npm run prerender && cp -r tmp/prerendered/* dist/",
+    "prod-build": "npm run build-themes && ng build --aot --prod",
     "postinstall": "webdriver-manager update && bash ./tools/fetch-assets.sh",
     "publish-prod": "npm run build-themes && ng build --aot --prod && firebase use material-angular-io && firebase deploy",
     "publish-dev": "npm run build-themes && ng build --aot --prod && firebase use material2-docs-dev && firebase deploy"
@@ -28,6 +29,7 @@
     "@angular/platform-browser": "^4.0.0",
     "@angular/platform-browser-dynamic": "^4.0.0",
     "@angular/router": "^4.0.0",
+    "@angular/service-worker": "^1.0.0-beta.16",
     "core-js": "^2.4.1",
     "rxjs": "^5.1.0",
     "zone.js": "^0.8.4"
diff --git a/src/assets/img/favicons/manifest.json b/src/assets/img/favicons/manifest.json
index 5c47afaf0..83ce6ba49 100644
--- a/src/assets/img/favicons/manifest.json
+++ b/src/assets/img/favicons/manifest.json
@@ -1,5 +1,11 @@
 {
-  "name": "Angular.io",
+  "name": "Angular Material",
+  "short_name": "Angular Material",
+  "theme_color": "#FFFFFF",
+  "background_color": "#3F51B5",
+  "start_url": "/",
+  "display": "standalone",
+  "orientation": "portrait",
   "icons": [
     {
       "src": "\/android-chrome-36x36.png",