diff --git a/package.json b/package.json
index 219b1561783c..45d406e3d69f 100644
--- a/package.json
+++ b/package.json
@@ -60,6 +60,7 @@
     "redbox-react": "^1.2.2",
     "redux": "^3.5.2",
     "request": "^2.74.0",
+    "serve-favicon": "^2.3.0",
     "shelljs": "^0.7.4",
     "stack-source-map": "^1.0.5",
     "style-loader": "0.13.1",
diff --git a/scripts/prepublish.sh b/scripts/prepublish.sh
index bd17feebb68e..7aa0cb3fcfbf 100755
--- a/scripts/prepublish.sh
+++ b/scripts/prepublish.sh
@@ -4,5 +4,6 @@ echo "> Start transpiling ES2015"
 echo ""
 rm -rf ./dist
 ./node_modules/.bin/babel --ignore __tests__ --plugins "transform-runtime" ./src --out-dir ./dist
+cp -r ./src/server/public ./dist/server/public
 echo ""
 echo "> Complete transpiling ES2015"
diff --git a/src/server/build.js b/src/server/build.js
index 196d7c834c38..5a87f37a7b37 100644
--- a/src/server/build.js
+++ b/src/server/build.js
@@ -40,6 +40,7 @@ const outputDir = program.outputDir || './storybook-static';
 // create output directory (and the static dir) if not exists
 shelljs.rm('-rf', outputDir);
 shelljs.mkdir('-p', path.resolve(outputDir));
+shelljs.cp(path.resolve(__dirname, 'public/favicon.ico'), outputDir);
 
 // The addon database service is disabled by default for now
 // It should be enabled with the --enable-db for dev server
diff --git a/src/server/index.js b/src/server/index.js
index 9e4425b87809..947d1b0e0bb8 100755
--- a/src/server/index.js
+++ b/src/server/index.js
@@ -2,6 +2,7 @@
 
 import datastore from '@kadira/storybook-database-local/dist/server/middleware';
 import express from 'express';
+import favicon from 'serve-favicon';
 import program from 'commander';
 import path from 'path';
 import fs from 'fs';
@@ -51,6 +52,7 @@ if (program.host) {
 }
 
 const app = express();
+app.use(favicon(path.resolve(__dirname, 'public/favicon.ico')));
 
 if (program.staticDir) {
   program.staticDir = parseList(program.staticDir);
diff --git a/src/server/public/favicon.ico b/src/server/public/favicon.ico
new file mode 100644
index 000000000000..31b707d749bd
Binary files /dev/null and b/src/server/public/favicon.ico differ