diff --git a/.gitignore b/.gitignore
index ab35a21..d93e53b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ i3lock-1.0-20100320git.tar.bz2
 /i3lock-2.4.1.tar.bz2
 /i3lock-2.5.tar.bz2
 /i3lock-2.6.tar.bz2
+/i3lock-2.7.tar.bz2
+/i3lock-2.8.tar.bz2
diff --git a/i3lock.spec b/i3lock.spec
index f46af2c..6f12a53 100644
--- a/i3lock.spec
+++ b/i3lock.spec
@@ -1,17 +1,19 @@
 Name:           i3lock
-Version:        2.6
+Version:        2.8
 Release:        1%{?dist}
 Summary:        Simple X display locker like slock
 License:        MIT
 URL:            http://i3wm.org/i3lock/
 Source0:        http://i3wm.org/%{name}/%{name}-%{version}.tar.bz2
+# TODO: Replace these below with pkgconfig\(\) in the future in rapt
+# with guidelines.
 BuildRequires:  cairo-devel
 BuildRequires:  pam-devel
 BuildRequires:  libev-devel
-BuildRequires:  libX11-devel
 BuildRequires:  libxcb-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libxkbcommon-devel
+BuildRequires:  libxkbcommon-x11-devel
 BuildRequires:  libxkbfile-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  xcb-util-keysyms-devel
@@ -31,25 +33,41 @@ resuming from suspend, at least sometimes.
 %setup -q
 # Relocatable.
 sed \
-    -e 's|PREFIX=/usr|PREFIX=%{_prefix}|g' \
-    -e 's|SYSCONFDIR=/etc|SYSCONFDIR=%{_sysconfdir}|g' \
+    -e 's|PREFIX=/usr|PREFIX=%{_prefix}|g'              \
+    -e 's|SYSCONFDIR=/etc|SYSCONFDIR=%{_sysconfdir}|g'  \
+    -e 's|-Wall|%{optflags}|g'                                          \
     -i Makefile
 
 %build
-# we have to add libev cflags because the Makefile doesn't list them
-CFLAGS="%{optflags} `pkg-config --cflags libev`" make %{?_smp_mflags}
+LDFLAGS="%{?__global_ldflags}" %make_build
 
 %install
 %make_install INSTALL="install -p"
 install -Dpm0644 i3lock.1 %{buildroot}%{_mandir}/man1/i3lock.1
 
 %files
-%doc CHANGELOG LICENSE README
+%doc CHANGELOG README*
+%license LICENSE
 %{_bindir}/%{name}
 %{_sysconfdir}/pam.d/%{name}
 %{_mandir}/man1/i3lock.1*
 
 %changelog
+* Tue Jun 07 2016 Christian Dersch <lupinix@mailbox.org> - 2.8-1
+- new version
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Sun Sep 13 2015 Christopher Meng <rpm@cicku.me> - 2.7-1
+- Update to 2.7
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Tue Jul 29 2014 Christopher Meng <rpm@cicku.me> - 2.6-1
 - Update to 2.6
 
@@ -88,7 +106,7 @@ install -Dpm0644 i3lock.1 %{buildroot}%{_mandir}/man1/i3lock.1
 * Sat Mar 20 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 1.0-4.20100320git
 - Update to current git
 
-* Sat Feb 05 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 1.0-3
+* Sat Feb 06 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 1.0-3
 - Some bugfixes (sync with upstream)
 
 * Sat Jan 09 2010 Simon Wesp <cassmodiah@fedoraproject.org> - 1.0-2
diff --git a/sources b/sources
index 87b73a4..0266fc1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-46870f347f474a894ec8044717b4d925  i3lock-2.6.tar.bz2
+89de7b7d46fdb05638122cf3c2512093  i3lock-2.8.tar.bz2