diff --git a/.gitignore b/.gitignore
index bac3f70..fe1192c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /0.11-rc2.tar.gz
 /0.11-rc3.tar.gz
 /0.11.tar.gz
+/sway-b3c0aa3.tar.gz
diff --git a/fix_1008.patch b/fix_1008.patch
deleted file mode 100644
index 4b253a2..0000000
--- a/fix_1008.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/sway/handlers.c b/sway/handlers.c
-index 3abe2fc..ad6c1c1 100644
---- a/sway/handlers.c
-+++ b/sway/handlers.c
-@@ -807,6 +807,10 @@ static bool swayc_border_check(swayc_t *c, const void *_origin) {
- 	const struct wlc_point *origin = _origin;
- 	const struct wlc_geometry title_bar = c->title_bar_geometry;
- 
-+	if (c->border_type != B_NORMAL) {
-+		return false;
-+	}
-+
- 	if (origin->x >= title_bar.origin.x && origin->y >= title_bar.origin.y
- 		&& origin->x < title_bar.origin.x + (int32_t)title_bar.size.w
- 		&& origin->y < title_bar.origin.y + (int32_t)title_bar.size.h) {
diff --git a/fix_971.patch b/fix_971.patch
deleted file mode 100644
index fe807de..0000000
--- a/fix_971.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur sway-0.11.orig/swaylock/main.c sway-0.11/swaylock/main.c
---- sway-0.11.orig/swaylock/main.c	2016-12-28 01:13:55.071950460 +0100
-+++ sway-0.11/swaylock/main.c	2016-12-28 01:15:03.135688499 +0100
-@@ -236,7 +236,7 @@
- 	case SCALING_MODE_FILL:
- 	{
- 		double window_ratio = (double) wwidth / wheight;
--		double bg_ratio = wheight;
-+		double bg_ratio = width / height;
- 
- 		if (window_ratio > bg_ratio) {
- 			double scale = (double) wwidth / width;
-@@ -348,7 +348,7 @@
- 		"  -v, --version                  Show the version number and quit.\n"
- 		"  -i, --image [<output>:]<path>  Display the given image.\n"
- 		"  -u, --no-unlock-indicator      Disable the unlock indicator.\n"
--		"  -f, --daemonize                Detach from the controlling terminal.\n" 
-+		"  -f, --daemonize                Detach from the controlling terminal.\n"
- 		"  --socket <socket>              Use the specified socket.\n";
- 
- 
diff --git a/fix_LD_LIBRARY_PATH.patch b/fix_LD_LIBRARY_PATH.patch
deleted file mode 100644
index 3bca315..0000000
--- a/fix_LD_LIBRARY_PATH.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d1c38ce..ea0e364 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -47,7 +47,7 @@ option(enable-swaymsg "Enables the swaymsg utility" YES)
- option(enable-gdk-pixbuf "Use Pixbuf to support more image formats" YES)
- option(zsh-completions "Zsh shell completions" NO)
- option(default-wallpaper "Installs the default wallpaper" YES)
--option(LD_LIBRARY_PATH "Configures sway's default LD_LIBRARY_PATH" "/usr/lib")
-+set(LD_LIBRARY_PATH "/usr/lib" CACHE STRING "Configures sway's default LD_LIBRARY_PATH")
- 
- add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
diff --git a/sources b/sources
index 68d9ca0..7c81432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (0.11.tar.gz) = 4cd69c83a0c8815ddc1663b4cd4b69c8d99d6d9d2a030e575c544836e3dfba445bc6407f7eaf97c0d7fdefd62e3ceed4206195ad91701f840ec8686f3b75989c
+SHA512 (sway-b3c0aa3.tar.gz) = 1098fd899e606841a312d307d407e22ac0852ffc622a9bae888c14482e295e11e69b908dba98df434eadc772ead62c12e3b75b7d25c40103ade6acaff9659a93
diff --git a/sway.spec b/sway.spec
index b0c400c..0d17003 100644
--- a/sway.spec
+++ b/sway.spec
@@ -1,17 +1,14 @@
+%global commit0 b3c0aa3a9e7dfd8f70643bbfaf64c8af1f58a7fa
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+
 Name:           sway
 Version:        0.11
-Release:        5%{?dist}
+Release:        6.git%{shortcommit0}%{?dist}
 Summary:        i3-compatible window manager for Wayland
 Group:          User Interface/X
 License:        MIT
 URL:            https://github.com/SirCmpwn/sway
-Source0:        https://github.com/SirCmpwn/%{name}/archive/%{version}.tar.gz
-# https://github.com/SirCmpwn/sway/pull/1017
-Patch0:         fix_971.patch
-# https://github.com/SirCmpwn/sway/commit/6a1df17fb7f7bcfa26d825173de4d31b771fd7a6
-Patch1:         fix_LD_LIBRARY_PATH.patch
-# https://github.com/SirCmpwn/sway/issues/1008
-Patch2:         fix_1008.patch
+Source0:        %{url}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(wlc)
 BuildRequires:  wayland-devel
@@ -43,7 +40,7 @@ Sway is a tiling window manager supporting Wayland compositor protocol and
 i3-compatible configuration.
 
 %prep
-%autosetup -p1
+%autosetup -n %{name}-%{commit0}
 mkdir %{_target_platform}
 
 %build
@@ -84,6 +81,9 @@ sed -i "s|^output \* bg .*|output * bg /usr/share/backgrounds/f%{fedora}/default
 %{_datadir}/zsh/site-functions/_sway*
 
 %changelog
+* Tue Jan 24 2017 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.11-6.gitb3c0aa3
+- Update to HEAD
+
 * Thu Jan 12 2017 Fabio Alessandro Locati <fale@fedoraproject.org> - 0.11-5
 - Fix bug #1008 with backported patch