diff --git a/.gitignore b/.gitignore
index 98ced20..c37d387 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 netlabel_tools-0.19.tar.gz
 /netlabel_tools-0.20.tar.gz
+/netlabel_tools-0.21.tar.gz
diff --git a/netlabel_tools.spec b/netlabel_tools.spec
index 4fa0237..7ac59ab 100644
--- a/netlabel_tools.spec
+++ b/netlabel_tools.spec
@@ -1,15 +1,13 @@
 Summary: Tools to manage the Linux NetLabel subsystem
 Name: netlabel_tools
-Version: 0.20
-Release: 6%{?dist}
+Version: 0.21
+Release: 0%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
-URL: http://netlabel.sf.net/
-Source0: http://downloads.sourceforge.net/netlabel/%{name}-%{version}.tar.gz
-# http://sourceforge.net/p/netlabel/bugs/1/
-Patch0: 0001-Port-to-libnl3.patch
+Source: https://github.com/netlabel/netlabel_tools/releases/download/v%{version}/%{name}-%{version}.tar.gz
+URL: https://github.com/netlabel/netlabel_tools
 
-Requires: kernel
+Requires: kernel libnl3
 Requires(post): systemd
 Requires(preun): systemd
 Requires(postun): systemd
@@ -27,19 +25,23 @@ kernel subsystem.
 
 %prep
 %setup -q
-%patch0 -p1 -b .nl3
 
 %build
-./configure --prefix="%{_prefix}" --libdir="%{_libdir}" --enable-systemd
-CFLAGS="%{optflags}" make V=1 %{?_smp_mflags}
+%configure
+make V=1 %{?_smp_mflags}
 
 %install
+rm -rf "%{buildroot}"
 mkdir -p "%{buildroot}/etc"
 mkdir -p "%{buildroot}/%{_sbindir}"
 mkdir -p "%{buildroot}/%{_unitdir}"
 mkdir -p "%{buildroot}/%{_mandir}"
 make V=1 DESTDIR="%{buildroot}" install
 
+# NOTE: disable since the tests require messing with the running kernel
+#%check
+#make V=1 check
+
 %preun
 %systemd_preun netlabel.service
 
@@ -52,7 +54,9 @@ make V=1 DESTDIR="%{buildroot}" install
 %files
 %{!?_licensedir:%global license %%doc}
 %license LICENSE
-%doc README CHANGELOG
+%doc README
+%doc CHANGELOG
+%doc SUBMITTING_PATCHES
 %attr(0644,root,root) %{_mandir}/man8/*
 %attr(0755,root,root) %{_sbindir}/netlabelctl
 %attr(0755,root,root) %{_sbindir}/netlabel-config
@@ -60,6 +64,9 @@ make V=1 DESTDIR="%{buildroot}" install
 %attr(0644,root,root) %config(noreplace) /etc/netlabel.rules
 
 %changelog
+* Fri Jul 10 2015 Paul Moore <pmoore@redhat.com> - 0.21-0
+- New upstream version
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.20-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index fb9af35..231dfb5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-56b1a6c249fd18695d0134d1ec390cb2  netlabel_tools-0.20.tar.gz
+54ae1eb11a1b5201bea8a43a6fb08fc2  netlabel_tools-0.21.tar.gz