diff --git a/.gitignore b/.gitignore
index 30f48fa..81b9656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ libaccounts-glib-0.45.tar.gz
 /libaccounts-glib-1.8.tar.gz
 /libaccounts-glib-1.16.tar.gz
 /libaccounts-glib-1.18.tar.gz
+/libaccounts-glib-1.21.tar.gz
diff --git a/libaccounts-glib.spec b/libaccounts-glib.spec
index ff8b18d..9d0d83a 100644
--- a/libaccounts-glib.spec
+++ b/libaccounts-glib.spec
@@ -1,11 +1,17 @@
+
+%global commit0 00254a604a7c7bd38c41794a80ad8930e90f21aa
+%global gittag0 VERSION_%{version}
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+%global snap0 20160216
+
 Name:		libaccounts-glib
-Version:	1.18
-Release:	4%{?dist}
+Version:	1.21
+Release:	1%{?dist}
 Summary:	Accounts framework for Linux and POSIX based platforms
 License:	LGPLv2
 URL:        https://gitlab.com/accounts-sso/libaccounts-glib
 
-Source0:    https://gitlab.com/accounts-sso/%{name}/repository/archive.tar.gz?ref=VERSION_%{version}#/%{name}-%{version}.tar.gz
+Source0:    https://gitlab.com/accounts-sso/%{name}/repository/archive.tar.gz?ref=%{gittag0}#/%{name}-%{version}.tar.gz
 
 BuildRequires:	dbus-glib-devel
 BuildRequires:	libxml2-devel
@@ -22,7 +28,6 @@ BuildRequires:	gtk-doc
 %package devel
 Summary:	Development files for %{name}
 Requires:	%{name}%{?_isa} = %{version}-%{release}
-
 %description devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
@@ -30,48 +35,51 @@ developing applications that use %{name}.
 %package docs
 Summary:	Documentation for %{name}
 BuildArch:	noarch
-
 %description docs
 The %{name}-docs package contains documentation for %{name}.
 
+
 %prep
-%setup -q
+%autosetup -n %{name}-%{gittag0}-%{commit0}
+
 
 %build
-gtkdocize
-autoreconf -i --force
+NOCONFIGURE=1 \
+./autogen.sh
 
-%configure --disable-static \
-	--disable-gtk-doc
+%configure \
+  --disable-static \
+  --enable-gtk-doc
 
 make %{?_smp_mflags}
 
+
 %install
 make install DESTDIR=%{buildroot}
 
-rm -f %{buildroot}%{_libdir}/*.la
+rm -fv %{buildroot}%{_libdir}/lib*.la
 
 # create/own data dirs
 mkdir -p %{buildroot}%{_datadir}/accounts/{applications,providers,services,service_types}
 
 # add docs manuall to %%doc instead
-rm -rf %{buildroot}%{_prefix}/doc/reference
+rm -rfv %{buildroot}%{_prefix}/doc/reference
 
-# remove tests for now
-rm -f %{buildroot}%{_bindir}/*test*
-rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
+%check
+# advisory and non-fatal for now
+make check || cat tests/test-suite.log ||:
 
-%post -p /sbin/ldconfig
 
+%post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
 %license COPYING
-%doc AUTHORS INSTALL ChangeLog README NEWS
+%doc AUTHORS ChangeLog README NEWS
 %{_bindir}/ag-backup
 %{_bindir}/ag-tool
-%{_mandir}/man1/ag-backup.1.gz
-%{_mandir}/man1/ag-tool.1.gz
+%{_mandir}/man1/ag-backup.1*
+%{_mandir}/man1/ag-tool.1*
 %dir %{_datadir}/backup-framework
 %dir %{_datadir}/backup-framework/applications
 %{_datadir}/backup-framework/applications/*.conf
@@ -93,16 +101,21 @@ rm -rf %{buildroot}%{_datadir}/libaccounts-glib0-test
 %{_libdir}/pkgconfig/libaccounts-glib.pc
 %{_includedir}/libaccounts-glib
 %{_datadir}/gir-1.0/Accounts-1.0.gir
-%{_libdir}/libaccounts-glib/
 %{_datadir}/dbus-1/interfaces/*.xml
-%{_datadir}/libaccounts-glib/
 %{_datadir}/vala/vapi/libaccounts-glib.deps
 %{_datadir}/vala/vapi/libaccounts-glib.vapi
+## testing bits
+%{_datadir}/libaccounts-glib/
+%{_libdir}/libaccounts-glib/
 
 %files docs
 %doc %{_datadir}/gtk-doc/html/libaccounts-glib/
 
+
 %changelog
+* Tue Feb 23 2016 Rex Dieter <rdieter@fedoraproject.org> 1.21-1
+- 1.21, %%check: (advisory) 'make check' 
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.18-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index bab06c4..3178c0e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa37ebbe1cc1e8b738368ba86142c197  libaccounts-glib-1.18.tar.gz
+88184b9d613e04ae17b164019661d35d  libaccounts-glib-1.21.tar.gz