diff --git a/admin.php b/admin.php
index 5ce62c00..838c78f4 100644
--- a/admin.php
+++ b/admin.php
@@ -211,9 +211,6 @@ class AdminPlugin extends Plugin
         $twig->twig_vars['base_url'] = $twig->twig_vars['base_url_relative'];
         $twig->twig_vars['admin'] = $this->admin;
 
-        // fake grav update
-        $twig->twig_vars['grav_update'] = array('current' => '0.9.1', 'available' => '0.9.1');
-
         switch ($this->template) {
             case 'dashboard':
                 $twig->twig_vars['popularity'] = $this->popularity;
diff --git a/classes/controller.php b/classes/controller.php
index 4bb3a44f..59fe4168 100644
--- a/classes/controller.php
+++ b/classes/controller.php
@@ -682,6 +682,35 @@ class AdminController
         return true;
     }
 
+    /**
+     * Handles updating Grav
+     *
+     * @return bool True is the action was performed
+     */
+    public function taskUpdategrav()
+    {
+        require_once __DIR__ . '/gpm.php';
+
+        if (!$this->authoriseTask('install grav', ['admin.super'])) {
+            return;
+        }
+
+        if (is_link(ROOT_DIR . 'index.php')) {
+            $this->admin->json_response = ['status' => 'error', 'message' => 'Cannot upgrade: Grav is symlinked. Please upgrade manually'];
+            return false;
+        }
+
+        $result = \Grav\Plugin\Admin\Gpm::selfupgrade();
+
+        if ($result) {
+            $this->admin->json_response = ['status' => 'success', 'message' => 'Grav was successfully updated to '];
+        } else {
+            $this->admin->json_response = ['status' => 'error', 'message' => 'Grav update failed'];
+        }
+
+        return true;
+    }
+
     /**
      * Handles updating plugins and themes
      *
diff --git a/classes/gpm.php b/classes/gpm.php
index f83e559c..ab39cd0c 100644
--- a/classes/gpm.php
+++ b/classes/gpm.php
@@ -5,6 +5,7 @@ use Grav\Common\GravTrait;
 use Grav\Common\GPM\GPM as GravGPM;
 use Grav\Common\GPM\Installer;
 use Grav\Common\GPM\Response;
+use Grav\Common\GPM\Upgrader;
 use Grav\Common\Filesystem\Folder;
 use Grav\Common\GPM\Common\Package;
 
@@ -156,4 +157,32 @@ class Gpm
 
         return $cache_dir . DS . $filename;
     }
-}
\ No newline at end of file
+
+    private static function _downloadSelfupgrade($package, $tmp)
+    {
+        $output = Response::get($package['download'], []);
+        Folder::mkdir($tmp);
+        file_put_contents($tmp . DS . $package['name'], $output);
+        return $tmp . DS . $package['name'];
+    }
+
+    public static function selfupgrade() {
+        $upgrader = new Upgrader();
+        $update = $upgrader->getAssets()['grav-update'];
+        $tmp = CACHE_DIR . 'tmp/Grav-' . uniqid();
+        $file = self::_downloadSelfupgrade($update, $tmp);
+
+        Installer::install($file, GRAV_ROOT,
+            ['sophisticated' => true, 'overwrite' => true, 'ignore_symlinks' => true]);
+
+        $errorCode = Installer::lastErrorCode();
+
+        Folder::delete($tmp);
+
+        if ($errorCode & (Installer::ZIP_OPEN_ERROR | Installer::ZIP_EXTRACT_ERROR)) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/themes/grav/js/admin-all.js b/themes/grav/js/admin-all.js
index ad32bd3c..7618c731 100644
--- a/themes/grav/js/admin-all.js
+++ b/themes/grav/js/admin-all.js
@@ -112,7 +112,7 @@ $(function () {
     });
 
     // Update plugins/themes
-    $('[data-maintenance-update]').on('click', function(e) {
+    $(document).on('click', '[data-maintenance-update]', function(e) {
 
         $(this).attr('disabled','disabled').find('> .fa').removeClass('fa-cloud-download').addClass('fa-refresh fa-spin');
         var url = $(this).data('maintenanceUpdate');
@@ -122,7 +122,17 @@ $(function () {
             url: url,
             toastErrors: true,
             success: function(result, status) {
-                toastr.success(result.message);
+                if (url.indexOf('task:updategrav') !== -1) {
+                    if (result.status == 'success') {
+                        $('[data-gpm-grav]').remove();
+                        toastr.success(result.message + window.grav_available_version);
+                        $('#footer .grav-version').html(window.grav_available_version);
+                    } else {
+                        toastr.success(result.message);
+                    }
+                } else {
+                    toastr.success(result.message);
+                }
             }
         }).always(function() {
             GPMRefresh();
@@ -223,12 +233,17 @@ $(function () {
                 if (grav.isUpdatable) {
                     var icon    = '<i class="fa fa-bullhorn"></i> ';
                         content = 'Grav <b>v{available}</b> is now available! <span class="less">(Current: v{version})</span> ',
-                        button  = '<button class="button button-small secondary" data-gpm-update="grav">Update Grav Now</button>';
+                        button  = '<button data-maintenance-update="' + GravAdmin.config.base_url_relative + '/update.json/task:updategrav" class="button button-small secondary" id="grav-update-button">Update Grav Now</button>';
 
                     content = jQuery.substitute(content, {available: grav.available, version: grav.version});
                     $('[data-gpm-grav]').addClass('grav').html('<p>' + icon + content + button + '</p>');
+                    window.grav_available_version = grav.available;
                 }
 
+                $('#grav-update-button').on('click', function() {
+                    $(this).html('Updating... please wait, downloading 2MB+..');
+                });
+
                 // dashboard
                 if ($('.updates-chart').length) {
                     var missing = (resources.total + (grav.isUpdatable ? 1 : 0)) * 100 / (installed + (grav.isUpdatable ? 1 : 0)),
diff --git a/themes/grav/templates/partials/base.html.twig b/themes/grav/templates/partials/base.html.twig
index d79d5fa4..cf3ddfe1 100644
--- a/themes/grav/templates/partials/base.html.twig
+++ b/themes/grav/templates/partials/base.html.twig
@@ -73,13 +73,6 @@
             </div>
 
             <div class="grav-update" data-gpm-grav>
-            {% if admin.gpm.grav.isUpdatable() %}
-                <p>
-                <i class="fa fa-bullhorn"></i>
-                Grav <b>v{{ admin.gpm.grav.getVersion() }}</b> is now available! <span class="less">(Current: v{{ constant('GRAV_VERSION') }})</span>
-                <button class="button button-small secondary">Update Grav Now</button>
-                </p>
-            {% endif %}
             </div>
 
             <div class="content-padding">
@@ -97,7 +90,7 @@
                     {% block content_bottom %}{% endblock %}
                 </div>
                  <footer id="footer">
-                    <a href="http://getgrav.org">Grav</a> version {{ constant('GRAV_VERSION') }} was made with <i class="fa fa-heart"></i> by <a href="http:/www.rockettheme.com">RocketTheme</a>.
+                    <a href="http://getgrav.org">Grav</a> version <span class="grav-version">{{ constant('GRAV_VERSION') }}</span> was made with <i class="fa fa-heart"></i> by <a href="http://www.rockettheme.com">RocketTheme</a>.
                 </footer>
             </div>