diff --git a/jekyll/_layouts/default.html b/jekyll/_layouts/default.html
index bc6af5ec..49468025 100644
--- a/jekyll/_layouts/default.html
+++ b/jekyll/_layouts/default.html
@@ -5,6 +5,7 @@
 		<meta name="description" content="{{ site.tagline }}" />
 
 		<link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css">
+		<link rel="icon" type="image/png" href="images/favicon.png" />
 
 		<title>{{ page.title }}</title>
 	</head>
diff --git a/jekyll/_layouts/page.html b/jekyll/_layouts/page.html
index 94cc6ba2..1ff2522e 100644
--- a/jekyll/_layouts/page.html
+++ b/jekyll/_layouts/page.html
@@ -5,6 +5,7 @@
 		<meta name="description" content="{{ site.tagline }}" />
 
 		<link rel="stylesheet" type="text/css" media="screen" href="style/stylesheet.css">
+		<link rel="icon" type="image/png" href="images/favicon.png" />
 
 		<title>{{ page.title }}</title>
 	</head>
diff --git a/tools/build_gh_pages.sh b/tools/build_gh_pages.sh
index 000cfe99..6e45a5e8 100755
--- a/tools/build_gh_pages.sh
+++ b/tools/build_gh_pages.sh
@@ -2,8 +2,6 @@
 
 set -e
 
-BACKUPS=".git packages"
-
 BUILD="$(mktemp -dt solaar-gh-pages-XXXXXX)"
 cd "$(dirname "$0")"/..
 SELF="$PWD"
@@ -57,6 +55,7 @@ fix_times() {
 
 cp -upr "$SELF/jekyll"/* "$BUILD/"
 cp -up "$SELF/share/solaar/icons/solaar-logo.png" "$BUILD/images/"
+cp -up "$SELF/share/solaar/icons/solaar.png" "$BUILD/images/favicon.png"
 
 add_md docs/devices.md
 add_md docs/installation.md
@@ -71,13 +70,15 @@ for l in "$BUILD/_layouts"/*.html; do
 	mv "$l=" "$l"
 done
 
-BACKUPS_DIR="$(mktemp -d --tmpdir="$SITE/.." backups-XXXXXX)"
-for d in $BACKUPS; do
-	mv "$SITE/$d" "$BACKUPS_DIR"
-done
+mkdir -p "$SITE/../packages"
+cp -up "$SELF/dist/debian"/*.deb "$SITE/../packages/"
+
+GIT_BACKUP="$(mktemp -ud --tmpdir="$SITE/.." git-backup-XXXXXX)"
+mv "$SITE/.git" "$GIT_BACKUP"
 jekyll --kramdown "$BUILD" "$SITE"
-mv "$BACKUPS_DIR"/* "$BACKUPS_DIR"/.[a-z]* "$SITE/"
-rm -rf "$BACKUPS_DIR"
+mv "$GIT_BACKUP" "$SITE/.git"
+
+cp -al "$SITE/../packages/" "$SITE/"
 
 for p in "$SITE"/*.html; do
 	sed -i -e 's#^[ ]*##g' "$p"
@@ -99,6 +100,3 @@ fix_times docs/installation.md installation.html
 fix_times jekyll/images images
 fix_times share/solaar/icons/solaar-logo.png images/solaar-logo.png
 fix_times jekyll/style style
-
-mkdir -p "$SITE/packages"
-cp -up "$SELF/dist/debian"/*.deb "$SITE/packages/"