diff --git a/php-akamai-open-edgegrid-auth.spec b/php-akamai-open-edgegrid-auth.spec
index de632ed..41430f9 100644
--- a/php-akamai-open-edgegrid-auth.spec
+++ b/php-akamai-open-edgegrid-auth.spec
@@ -27,7 +27,7 @@
 
 Name:          php-%{composer_vendor}-%{composer_project}
 Version:       %{github_version}
-Release:       1%{?github_release}%{?dist}
+Release:       2%{?github_release}%{?dist}
 Summary:       Implements the Akamai {OPEN} EdgeGrid Authentication
 
 Group:         Development/Libraries
@@ -37,7 +37,7 @@ Source0:       %{url}/archive/%{github_commit}/%{name}-%{github_version}-%{githu
 
 BuildArch:     noarch
 # Autoloader
-BuildRequires: %{_bindir}/phpab
+BuildRequires: php-fedora-autoloader-devel
 # Tests
 %if %{with_tests}
 ## composer.json
@@ -57,6 +57,8 @@ Requires:      php(language) >= %{php_min_ver}
 Requires:      php-date
 Requires:      php-hash
 Requires:      php-pcre
+# Autoloader
+Requires:      php-composer(fedora/autoloader)
 
 # Weak dependencies
 %if 0%{?fedora} >= 21
@@ -85,7 +87,7 @@ Autoloader: %{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php
 
 %build
 : Create autoloader
-%{_bindir}/phpab --output src/autoload-auth.php src/
+%{_bindir}/phpab --template fedora --output src/autoload-auth.php src/
 
 
 %install
@@ -98,6 +100,13 @@ cp -rp src/* %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/
 : Remove logging from PHPUnit config
 sed '/log/d' phpunit.xml.dist > phpunit.xml
 
+%if 0%{?fedora} > 25
+: Temporarily skip test known to fail for PHP 7.1
+: See https://github.com/akamai-open/AkamaiOPEN-edgegrid-php/issues/2
+sed 's/function testTimestampFormat/function SKIP_testTimestampFormat/' \
+    -i tests/Authentication/TimestampTest.php
+%endif
+
 %{_bindir}/phpunit --verbose \
     --bootstrap %{buildroot}%{phpdir}/Akamai/Open/EdgeGrid/autoload-auth.php
 %else
@@ -119,5 +128,10 @@ sed '/log/d' phpunit.xml.dist > phpunit.xml
 
 
 %changelog
+* Fri Dec 09 2016 Shawn Iwinski <shawn@iwin.ski> - 0.6.0-2
+- Temporarily skip test known to fail for PHP 7.1 (see
+  https://github.com/akamai-open/AkamaiOPEN-edgegrid-php/issues/2 )
+- Use php-composer(fedora/autoloader)
+
 * Mon Oct 10 2016 Shawn Iwinski <shawn@iwin.ski> - 0.6.0-1
 - Initial package