diff --git a/.gitignore b/.gitignore
index 8f7d111..3489436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ alpine-2.00.tar.bz2
 /alpine-2.10.clean.tar.lzma
 /alpine-2.11.tar.xz
 /alpine-2.20.tar.xz
+/alpine-2.21.tar.xz
diff --git a/alpine.spec b/alpine.spec
index 10fbd80..a7816bf 100644
--- a/alpine.spec
+++ b/alpine.spec
@@ -5,16 +5,15 @@
 
 Summary: powerful, easy to use console email client
 Name: alpine
-Version: 2.20
-Release: 5%{?dist}
+Version: 2.21
+Release: 1%{?dist}
 
 License: ASL 2.0
-Group: Applications/Internet
 # Upstream change - see https://groups.google.com/forum/#!msg/comp.mail.pine/4w_f1ro6GRA/faiu1Egw_ywJ
 #URL: http://re-alpine.sourceforge.net/ 
 #Source0:  http://downloads.sourceforge.net/sourceforge/re-alpine/re-alpine-%{version}%{?pre}.tar.bz2
-URL: http://patches.freeiz.com/alpine/info/alpine.html
-Source0: http://patches.freeiz.com/alpine/patches/alpine-%{version}/alpine-%{version}.tar.xz
+URL:     http://alpine.freeiz.com/
+Source0: http://alpine.freeiz.com/alpine/release/src/alpine-%{version}.tar.xz
 Source1: README.fedora
 
 # Using "Conflicts" instead of Obsoletes because while alpine is substantially
@@ -75,8 +74,6 @@ GNU Build System's autotools.
 
 install -m644 -p %{SOURCE1} .
 
-#autoreconf -f -i
-
 
 %build
 touch imap/ip6
@@ -97,7 +94,6 @@ make %{?_smp_mflags} EXTRACFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # create/touch %ghost'd files
@@ -106,12 +102,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf
 touch $RPM_BUILD_ROOT%{_sysconfdir}/pine.conf.fixed
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc README LICENSE
 %doc README.fedora
 %ghost %config(noreplace) %{_sysconfdir}/pine.conf
@@ -129,6 +120,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jun 16 2017 Rex Dieter <rdieter@fedoraproject.org> - 2.21-1
+- alpine 2.21, update URL, .spec cosmetics
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.20-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index a1751d0..00bb3d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2d63c923f7995890c0eecfc0c3d1c936  alpine-2.20.tar.xz
+SHA512 (alpine-2.21.tar.xz) = a2a36a033c8af79810816a7da7185c269808ba6d84d013691fd8b3764c63f5fb2284e6844ec5a5e99d168514ae636debf59fae962533a2916679e4e9109c6264