diff --git a/.gitignore b/.gitignore
index ab8c0d8..407e850 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ package-*.xml
 /CAS-1.3.2.tgz
 /CAS-1.3.3.tgz
 /CAS-1.3.4.tgz
+/php-pear-CAS-1.3.5-61c8899.tar.gz
diff --git a/php-pear-CAS.spec b/php-pear-CAS.spec
index 1b82645..4d2bf52 100644
--- a/php-pear-CAS.spec
+++ b/php-pear-CAS.spec
@@ -1,45 +1,47 @@
 # remirepo/fedora spec file for php-pear-CAS
 #
-# Copyright (c) 2010-2016 Remi Collet
+# Copyright (c) 2010-2017 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-%{!?__pear:       %global __pear       %{_bindir}/pear}
-%global pear_name CAS
-%global channel   __uri
-#global prever    RC7
+%global gh_commit    61c8899c8f91204e8b9135d795461e50fe5c2db0
+%global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
+%global gh_owner     Jasig
+%global gh_project   phpCAS
 
 
 Name:           php-pear-CAS
-Version:        1.3.4
-Release:        3%{?dist}
+Version:        1.3.5
+Release:        1%{?dist}
 Summary:        Central Authentication Service client library in php
 
 Group:          Development/Libraries
 License:        ASL 2.0
 URL:            https://wiki.jasig.org/display/CASC/phpCAS
 
-Source0:        http://downloads.jasig.org/cas-clients/php/%{version}%{?prever}/%{pear_name}-%{version}%{?prever}.tgz
+Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{?gh_short}.tar.gz
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
+BuildRequires:  php-fedora-autoloader-devel
+# only for pear macros
 BuildRequires:  php-pear
-BuildRequires:  php-composer(theseer/autoload)
+# for %%check
+BuildRequires:  php-cli
 
-Requires(post): %{__pear}
-Requires(postun): %{__pear}
-Requires:       php-pear(PEAR)
 Requires:       php-curl
+Requires:       php-date
 Requires:       php-dom
+Requires:       php-hash
 Requires:       php-pcre
 Requires:       php-pdo
 Requires:       php-session
 Requires:       php-spl
 # Optional: php-imap (when use Proxied Imap)
+Requires:       php-composer(fedora/autoloader)
 
-Provides:       php-pear(%{channel}/%{pear_name}) = %{version}
+Provides:       php-pear(__uri/CAS) = %{version}
 Provides:       php-composer(jasig/phpcas) = %{version}
 # this library is mostly known as phpCAS
 Provides:       phpCAS = %{version}-%{release}
@@ -52,59 +54,54 @@ Autoloader '%{pear_phpdir}/CAS/Autoload.php';
 
 
 %prep
-%setup -q -c
+%setup -q -n %{gh_project}-%{gh_commit}
 
-cd %{pear_name}-%{version}%{?prever}
-mv ../package.xml %{name}.xml
 
 
 %build
-cd %{pear_name}-%{version}%{?prever}
-# Empty build section, most likely nothing required.
-
-
-%install
-rm -rf %{buildroot}
-cd %{pear_name}-%{version}%{?prever}
-%{__pear} install --nodeps --packagingroot %{buildroot} %{name}.xml
-
-# Clean up unnecessary files
-rm -rf %{buildroot}%{pear_metadir}/.??*
-
-# Install XML package description
-mkdir -p %{buildroot}%{pear_xmldir}
-install -pm 644 %{name}.xml %{buildroot}%{pear_xmldir}
-
 # Rewrite a classmap autoloader (upstream is broken)
 %{_bindir}/phpab \
-    --output %{buildroot}%{pear_phpdir}/CAS/Autoload.php  \
-             %{buildroot}%{pear_phpdir}
+    --template fedora \
+    --output source/CAS/Autoload.php  \
+             source
 
 
-%clean
-rm -rf %{buildroot}
-
-
-%post
-%{__pear} install --nodeps --soft --force --register-only \
-    %{pear_xmldir}/%{name}.xml >/dev/null || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    %{__pear} uninstall --nodeps --ignore-errors --register-only \
-        %{channel}/%{pear_name} >/dev/null || :
-fi
+%install
+mkdir -p %{buildroot}%{pear_phpdir}
+cp -pr source/* %{buildroot}%{pear_phpdir}/
+
+
+%check
+: Ensure our autoloader works
+php -r '
+require "%{buildroot}%{pear_phpdir}/CAS/Autoload.php";
+if (!class_exists("phpCAS")) {
+  echo "Class not found\n";
+  exit(1);
+}
+if (phpCAS::getVersion() != "%{version}") {
+  echo "Bad version (found=" . phpCAS::getVersion()  . ", expected=%{version})\n";
+  exit(1);
+}
+echo "Ok\n";
+'
 
 
 %files
-%defattr(-,root,root,-)
-%doc %{pear_docdir}/%{pear_name}
-%{pear_xmldir}/%{name}.xml
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
+%doc composer.json
+%doc NOTICE *.md
 %{pear_phpdir}/CAS
 %{pear_phpdir}/CAS.php
 
 
 %changelog
+* Tue Apr 11 2017 Remi Collet <remi@remirepo.net> - 1.3.5-1
+- update to 1.3.5
+- sources from github
+- add minimal check for our autoloader
+
 * Wed Oct 19 2016 Remi Collet <remi@fedoraproject.org> - 1.3.4-3
 - fix broken autoloader
 
diff --git a/sources b/sources
index 992143d..9c7a4a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58f93724ec52929658bb8f1be8fa2154  CAS-1.3.4.tgz
+SHA512 (php-pear-CAS-1.3.5-61c8899.tar.gz) = f616be53705f0406441bac59482a11e47624e299e01ef0a26bc034c606ea05860f44429e9c3148bb4849a01f78b3cac9f28c27503e75dffa338f36e82afc1cb3