diff --git a/src/components/index.js b/src/components/index.js
index 751d4f8..1163869 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -7,6 +7,7 @@ import languageDropdown from './language-dropdown/language-dropdown';
 import loadFileButton from './load-file-button/load-file-button';
 import navbar from './navbar/navbar';
 import statusOlsr from './status-olsr/status-olsr';
+import systemUpgrade from './system-upgrade/system-upgrade';
 import wizard from './wizard/wizard';
 import wizardContact from './wizard-contact/wizard-contact';
 import wizardDevice from './wizard-device/wizard-device';
@@ -24,6 +25,7 @@ export default module('app.components', [
   loadFileButton.name,
   navbar.name,
   statusOlsr.name,
+  systemUpgrade.name,
   wizard.name,
   wizardContact.name,
   wizardDevice.name,
diff --git a/src/components/load-file-button/load-file-button.html b/src/components/load-file-button/load-file-button.html
index 9d65de8..8e7a14e 100644
--- a/src/components/load-file-button/load-file-button.html
+++ b/src/components/load-file-button/load-file-button.html
@@ -1,4 +1,4 @@
-<label class="btn btn-default btn-sm">
+<label class="btn btn-default btn-sm" ng-disabled="$ctrl.disabled">
   <div ng-transclude></div>
-  <input type="file" accept="{{$ctrl.accept}}">
+  <input type="file" accept="{{$ctrl.accept}}" ng-disabled="$ctrl.disabled">
 </label>
diff --git a/src/components/load-file-button/load-file-button.js b/src/components/load-file-button/load-file-button.js
index 6feb719..da0f342 100644
--- a/src/components/load-file-button/load-file-button.js
+++ b/src/components/load-file-button/load-file-button.js
@@ -6,6 +6,8 @@ export default module('app.components.load-file-button', [])
   .component('loadFileButton', {
     bindings: {
       accept: '@',
+      disabled: '<',
+      type: '@',
       onDismiss: '&',
       onLoaded: '&',
     },
@@ -24,7 +26,16 @@ export default module('app.components.load-file-button', [])
         reader.onload = frEvent => this.$scope.$apply(() => {
           this.onLoaded({content: frEvent.target.result});
         });
-        reader.readAsText(event.target.files[0]);
+        const file = event.target.files[0];
+        switch (this.type) {
+          case 'binary':
+            reader.readAsArrayBuffer(file);
+            break;
+          case 'text':
+            reader.readAsText(file);
+            break;
+          default: throw new Error(`type ${this.type} not recognized`);
+        }
       }
     },
     template: require('./load-file-button.html'),
diff --git a/src/components/navbar/navbar.html b/src/components/navbar/navbar.html
index 8ed0ceb..8cc4700 100644
--- a/src/components/navbar/navbar.html
+++ b/src/components/navbar/navbar.html
@@ -45,7 +45,14 @@
           </a>
           <ul class="dropdown-menu" uib-dropdown-menu>
             <li ui-sref-active="active"><a ui-sref="statusOlsr">OLSR</a></li>
-            <li ui-sref-active="active"><a href>System</a></li>
+          </ul>
+        </li>
+        <li ui-sref-active="active" class="dropdown" uib-dropdown ng-if="$ctrl.session.authentication">
+          <a href uib-dropdown-toggle>
+            System <i class="fa fa-fw fa-caret-down"></i>
+          </a>
+          <ul class="dropdown-menu" uib-dropdown-menu>
+            <li ui-sref-active="active"><a ui-sref="systemUpgrade">Upgrade</a></li>
           </ul>
         </li>
       </ul>
diff --git a/src/components/system-upgrade/system-upgrade.html b/src/components/system-upgrade/system-upgrade.html
new file mode 100644
index 0000000..ee53bf2
--- /dev/null
+++ b/src/components/system-upgrade/system-upgrade.html
@@ -0,0 +1,27 @@
+<div class="jumbotron wizard-bg-highlight" translate-namespace="systemUpgrade">
+  <div class="container">
+    <div class="ff-icon-container">
+      <div>
+        <span class="fa-stack fa-6x">
+          <i class="fa fa-circle fa-stack-2x"></i>
+          <i class="fa fa-wrench fa-stack-1x fa-inverse"></i>
+        </span>
+      </div>
+      <div class="ff-icon-body">
+        <h1 translate>.headline</h1>
+        <p translate>.help</p>
+        <load-file-button accept=".tar,.bin" on-loaded="$ctrl.upload(content)" type="binary" disabled="$ctrl.uploading">
+          <i class="fa fa-fw" ng-class="{
+            'fa-upload': !$ctrl.uploading,
+            'fa-spin fa-circle-o-notch': $ctrl.uploading,
+          }"></i>
+          Upload new firmware
+        </load-file-button>
+        <span ng-if="$ctrl.error" class="text-danger">
+          <span translate>.error</span>: {{$ctrl.error}}
+        </span>
+        <span ng-if="$ctrl.uploaded" class="text-success" translate>.success</span>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/components/system-upgrade/system-upgrade.js b/src/components/system-upgrade/system-upgrade.js
new file mode 100644
index 0000000..4f03682
--- /dev/null
+++ b/src/components/system-upgrade/system-upgrade.js
@@ -0,0 +1,55 @@
+import { module } from 'angular';
+import uiRouter from 'angular-ui-router';
+
+export default module('app.components.system-upgrade', [uiRouter])
+  .config(($stateProvider) => {
+    'ngInject';
+
+    $stateProvider.state({
+      component: 'systemUpgrade',
+      name: 'systemUpgrade',
+      resolve: {
+        connection: ['session', session => session.currentConnect.catch(() => false)],
+      },
+      url: '/system/upgrade',
+    });
+  })
+  .component('systemUpgrade', {
+    controller: class SystemUpgradeCtrl {
+      constructor($q, $window, router) {
+        'ngInject';
+
+        this.$q = $q;
+        this.$window = $window;
+        this.router = router;
+      }
+
+      arrayBufferToBase64(buffer) {
+        let base64 = '';
+        const bytes = new Uint8Array(buffer);
+        for (let i = 0; i < bytes.byteLength; i += 1) {
+          base64 += String.fromCharCode(bytes[i]);
+        }
+        return this.$window.btoa(base64);
+      }
+
+      upload(content) {
+        this.uploading = true;
+        this.error = undefined;
+
+        const firmware = this.arrayBufferToBase64(content);
+
+        this.router.upgradeFirmware(firmware).then(
+          () => {
+            this.uploaded = true;
+            this.uploading = false;
+          },
+          (data) => {
+            this.uploading = false;
+            this.error = data.data;
+          },
+        );
+      }
+    },
+    template: require('./system-upgrade.html'),
+  });
diff --git a/src/components/wizard/wizard.html b/src/components/wizard/wizard.html
index 80b1999..175c9ed 100644
--- a/src/components/wizard/wizard.html
+++ b/src/components/wizard/wizard.html
@@ -15,7 +15,7 @@ <h1>{{'heading' | translate }}</h1>
           <p>This configuration wizard helps you to set up your router.</p>
           <div>
             Do you already have a config file?
-            <load-file-button accept=".json,application/json"
+            <load-file-button accept=".json,application/json" type="text"
               on-loaded="$ctrl.load(content)"
             >
               <i class="fa fa-fw fa-upload"></i> Load config
diff --git a/src/nls/locale-en.json b/src/nls/locale-en.json
index cf08449..957b61d 100644
--- a/src/nls/locale-en.json
+++ b/src/nls/locale-en.json
@@ -339,5 +339,11 @@
         "etx" : "Link Cost"
       }
     }
+  },
+  "systemUpgrade": {
+    "headline": "Upgrade Firmware",
+    "help": "Uprades your router to another version of the Freifunk Firmware",
+    "success": "Firmware successfully upgraded.",
+    "error": "Firmware upgrade error"
   }
 }
diff --git a/src/services/router.js b/src/services/router.js
index e5060f7..4e4a6cc 100644
--- a/src/services/router.js
+++ b/src/services/router.js
@@ -50,4 +50,8 @@ export default module('app.services.router', [])
     scanWifi(device) {
       return this.call('iwinfo', 'scan', {device});
     }
+
+    upgradeFirmware(firmware) {
+      return this.call('ffwizard', 'upgrade', {firmware});
+    }
   });