diff --git a/index-download-chrome.html b/index-download-chrome.html
index 675112999..a5626065b 100644
--- a/index-download-chrome.html
+++ b/index-download-chrome.html
@@ -8,7 +8,7 @@
 </head>
 <body>
   <div class="row">
-    <h1>Copay Installation:</h1>
+    <h1>Copay Chrome Installation:</h1>
     <ul>
       <li>Download <a href="copay-chrome-extension.zip">ZIP</a></li>
       <li>Unpack the ZIP file</li>
diff --git a/index-download-firefox.html b/index-download-firefox.html
new file mode 100644
index 000000000..0e23e2c1d
--- /dev/null
+++ b/index-download-firefox.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<title>Copay Firefox Addon - Install</title>
+	<link rel="stylesheet" href="../../css/foundation.min.css">
+</head>
+<body>
+  <div class="row">
+    <h1>Copay Firefox Installation:</h1>
+    <ul>
+      <li>Download <a href="copay-firefox-addon.xpi">XPI</a></li>
+      <li>Copay is installed!</li>
+    </ul>
+  </div>
+</body>
+</html>
diff --git a/index.html b/index.html
index 0e119019a..b45064051 100644
--- a/index.html
+++ b/index.html
@@ -209,9 +209,9 @@
             <div class="large-12 columns text-center line-dashed">
               <a href="#settings">Settings</a> &middot;
               <span ng-show="wallets.length">
-                <a href="#/setup">Create a new wallet</a> &middot;
+                <a href="#setup">Create a new wallet</a> &middot;
               </span>
-              <a ng-href="#import">Import a backup</a>
+              <a href="#import">Import a backup</a>
             </div>
           </div>
         </div> <!-- End !loading -->
diff --git a/util/generate-app-extension.sh b/util/generate-app-extension.sh
index d33485b61..07bfe2b50 100755
--- a/util/generate-app-extension.sh
+++ b/util/generate-app-extension.sh
@@ -13,10 +13,12 @@ fi
 # Configs
 APPDIR="./webapp"
 CHROMEDIR="./chrome-extension"
+FIREFOXDIR="./firefox-addon"
 
 LIBDIR="$APPDIR/lib"
 DOWNLOADDIR="$APPDIR/download"
 CHROMEDOWNLOADDIR="$DOWNLOADDIR/chrome"
+FIREFOXDOWNLOADDIR="$DOWNLOADDIR/firefox"
 
 ZIPFILE="copay.zip"
 CHROMEZIPFILE="copay-chrome-extension.zip"
@@ -50,6 +52,13 @@ fi
 
 mkdir -p $CHROMEDIR
 
+# Create/Clean chrome-extension dir
+if [ -d $FIREFOXDIR ]; then
+  rm -rf $FIREFOXDIR
+fi
+
+mkdir -p $FIREFOXDIR
+
 # Re-compile copayBundle.js
 echo -e "${OpenColor}${Green}* Generating copay bundle...${CloseColor}"
 grunt --target=dev shell
@@ -65,6 +74,11 @@ echo -e "${OpenColor}${Green}* Copying all chrome-extension files...${CloseColor
 cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html,manifest.json} $CHROMEDIR
 checkOK
 
+# Copy all firefox-addon files
+echo -e "${OpenColor}${Green}* Copying all firefox-addon files...${CloseColor}"
+cp -af {css,font,img,js,lib,sound,config.js,version.js,index.html,popup.html} $FIREFOXDIR
+checkOK
+
 # Zipping apps
 echo -e "${OpenColor}${Green}* Zipping all app files...${CloseColor}"
 zip -r $ZIPFILE $APPDIR
@@ -79,5 +93,6 @@ mkdir -p $CHROMEDOWNLOADDIR
 mv $ZIPFILE $DOWNLOADDIR
 mv $CHROMEZIPFILE $CHROMEDOWNLOADDIR
 cp index-download-chrome.html $CHROMEDOWNLOADDIR/index.html
+cp index-download-firefox.html $FIREFOXDOWNLOADDIR/index.html
 
 echo -e "${OpenColor}${Yellow}\nAwesome! Now you have the webapp in ./webapp and the chrome extension files in ./webapp/download/.${CloseColor}"
