diff --git a/data/config.ini b/data/config.ini
index 0cfa6aac..cd81d9f4 100644
--- a/data/config.ini
+++ b/data/config.ini
@@ -14,6 +14,7 @@ salt       = "1A2/$_4xVa"
 featuredPostMaxDays=7
 debugQueries=0
 logAnonymousUploads=1
+githubLink = http://github.com/rr-/szurubooru
 
 [help]
 title=Help
diff --git a/init.php b/init.php
index 6102642a..4e56d291 100644
--- a/init.php
+++ b/init.php
@@ -26,6 +26,9 @@ function download($source, $destination = null)
 	return $content;
 }
 
+$version = exec('git describe --tags --always --dirty');
+$branch = exec('git rev-parse --abbrev-ref HEAD');
+PropertyModel::set(PropertyModel::EngineVersion, $version . '@' . $branch);
 
 
 //jQuery
diff --git a/src/Models/PropertyModel.php b/src/Models/PropertyModel.php
index cf8d558b..4f7ecb11 100644
--- a/src/Models/PropertyModel.php
+++ b/src/Models/PropertyModel.php
@@ -10,6 +10,7 @@ final class PropertyModel implements IModel
 	const DbVersion = 3;
 	const PostSpaceUsage = 4;
 	const PostSpaceUsageUnixTime = 5;
+	const EngineVersion = 6;
 
 	static $allProperties;
 	static $loaded;
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 6539cdab..5162c8b2 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -40,7 +40,11 @@ Assets::addScript('core.js');
 			<div class="main-wrapper">
 				<hr/>
 				<div class="left">
-					<span><a href="<?= SZURU_LINK ?>">szurubooru&nbsp;v<?= SZURU_VERSION ?></a></span>
+					<span>
+						<a href="<?= getConfig()->misc->githubLink ?>">
+							szurubooru&nbsp;<?= PropertyModel::get(PropertyModel::EngineVersion) ?>
+						</a>
+					</span>
 					<?php if (Access::check(new Privilege(Privilege::ListLogs))): ?>
 						<span><a href="<?= \Chibi\Router::linkTo(['LogController', 'listView']) ?>">Logs</a></span>
 					<?php endif ?>
diff --git a/src/core.php b/src/core.php
index 3033e0c2..9abeda3c 100644
--- a/src/core.php
+++ b/src/core.php
@@ -1,9 +1,6 @@
 <?php
 $startTime = microtime(true);
 
-define('SZURU_VERSION', '0.7.1');
-define('SZURU_LINK', 'http://github.com/rr-/szurubooru');
-
 //basic settings and preparation
 define('DS', DIRECTORY_SEPARATOR);
 $rootDir = __DIR__ . DS . '..' . DS;