diff --git a/backup.js b/backup.js
new file mode 100644
index 000000000..d40121fb2
--- /dev/null
+++ b/backup.js
@@ -0,0 +1,114 @@
+/* Code to handle Backup/Restore functionality */
+
+const BACKUP_STORAGEFILE_DIR = "storage-files";
+
+function bangleDownload() {
+  var zip = new JSZip();
+  Progress.show({title:"Scanning...",sticky:true});
+  var normalFiles, storageFiles;
+  console.log("Listing normal files...");
+  Comms.listFiles({sf:false}).then(f => {
+    normalFiles = f;
+    console.log(" - "+f.join(","));
+    console.log("Listing StorageFiles...");
+    return Comms.listFiles({sf:true});
+  }).then(f => {
+    storageFiles = f;
+    console.log(" - "+f.join(","));
+    var fileCount = normalFiles.length + storageFiles.length;
+    var promise = Promise.resolve();
+    // Normal files
+    normalFiles.forEach((filename,n) => {
+      promise = promise.then(() => {
+        Progress.hide({sticky: true});
+        var percent = n/fileCount;
+        Progress.show({title:`Download ${filename}`,sticky:true,min:percent,max:percent,percent:0});
+        return Comms.readFile(filename).then(data => zip.file(filename,data));
+      });
+    });
+    // Storage files
+    if (storageFiles.length) {
+      var zipStorageFiles = zip.folder(BACKUP_STORAGEFILE_DIR);
+      storageFiles.forEach((filename,n) => {
+        promise = promise.then(() => {
+          Progress.hide({sticky: true});
+          var percent = (normalFiles.length+n)/fileCount;
+          Progress.show({title:`Download ${filename}`,sticky:true,min:percent,max:percent,percent:0});
+          return Comms.readStorageFile(filename).then(data => zipStorageFiles.file(filename,data));
+        });
+      });
+    }
+    console.log("Listing StorageFiles...");
+    return promise;
+  }).then(() => {
+    return zip.generateAsync({type:"blob"});
+  }).then(content => {
+    Progress.hide({ sticky: true });
+    showToast('Backup complete!', 'success');
+    Espruino.Core.Utils.fileSaveDialog(content, "Banglejs backup.zip");
+  }).catch(err => {
+    Progress.hide({ sticky: true });
+    showToast('Backup failed, ' + err, 'error');
+  });
+}
+
+function bangleUpload() {
+  Espruino.Core.Utils.fileOpenDialog({
+      id:"backup",
+      type:"arraybuffer",
+      mimeType:".zip,application/zip"}, function(data) {
+    if (data===undefined) return;
+    var promise = Promise.resolve();
+    var zip = new JSZip();
+    var cmds = "";
+    zip.loadAsync(data).then(function(zip) {
+      return showPrompt("Restore from ZIP","Are you sure? This will remove all existing apps");
+    }).then(()=>{
+      Progress.show({title:`Reading ZIP`});
+      zip.forEach(function (path, file){
+        console.log("path");
+        promise = promise
+        .then(() => file.async("string"))
+        .then(data => {
+          console.log("decoded", path);
+          if (path.startsWith(BACKUP_STORAGEFILE_DIR)) {
+            path = path.substr(BACKUP_STORAGEFILE_DIR.length+1);
+            cmds += AppInfo.getStorageFileUploadCommands(path, data)+"\n";
+          } else if (!path.includes("/")) {
+            cmds += AppInfo.getFileUploadCommands(path, data)+"\n";
+          } else console.log("Ignoring "+path);
+        });
+      });
+      return promise;
+    })
+    .then(() => {
+      Progress.hide({sticky:true});
+      Progress.show({title:`Erasing...`});
+      return Comms.removeAllApps(); })
+    .then(() => {
+      Progress.hide({sticky:true});
+      Progress.show({title:`Restoring...`, sticky:true});
+      return Comms.showMessage(`Restoring...`); })
+    .then(() => Comms.write("\x10"+Comms.getProgressCmd()+"\n"))
+    .then(() => Comms.uploadCommandList(cmds, 0, cmds.length))
+    .then(() => Comms.showMessage(Const.MESSAGE_RELOAD))
+    .then(() => {
+      Progress.hide({sticky:true});
+      showToast('Restore complete!', 'success');
+    })
+    .catch(err => {
+      Progress.hide({sticky:true});
+      showToast('Restore failed, ' + err, 'error');
+    });
+    return promise;
+  });
+}
+
+window.addEventListener('load', (event) => {
+  document.getElementById("downloadallapps").addEventListener("click",event=>{
+    bangleDownload();
+  });
+  document.getElementById("uploadallapps").addEventListener("click",event=>{
+    bangleUpload();
+  });
+});
diff --git a/core b/core
index affb0b15b..05f97e6ad 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit affb0b15b41eb35a1548373831af7001bad64435
+Subproject commit 05f97e6ade4605ac7a6105def52a34280f4f0c4d
diff --git a/index.html b/index.html
index 6c9a21bf8..a418b48eb 100644
--- a/index.html
+++ b/index.html
@@ -131,6 +131,8 @@
            <button class="btn" id="removeall">Remove all Apps</button>
            <button class="btn" id="installdefault">Install default apps</button>
            <button class="btn" id="installfavourite">Install favourite apps</button></p>
+        <p><button class="btn tooltip tooltip-right" id="downloadallapps" data-tooltip="Download all Bangle.js files to a ZIP file">Backup</button>
+           <button class="btn tooltip tooltip-right" id="uploadallapps" data-tooltip="Restore Bangle.js from a ZIP file">Restore</button></p>
         <h3>Settings</h3>
         <div class="form-group">
           <label class="form-switch">
@@ -170,6 +172,8 @@
     <script src="core/lib/heatshrink.js"></script>
     <script src="core/js/utils.js"></script>
     <script src="loader.js"></script>
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/jszip/3.7.1/jszip.min.js"></script> <!-- for backup.js -->
+    <script src="backup.js"></script>
     <script src="core/js/ui.js"></script>
     <script src="core/js/comms.js"></script>
     <script src="core/js/appinfo.js"></script>