diff --git a/.gitignore b/.gitignore
index 0b965e5..7619d5c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ clog
 /sql-parser-3.4.14-7078697.tar.gz
 /sql-parser-3.4.15-c5d382e.tar.gz
 /sql-parser-3.4.16-18a18d5.tar.gz
+/php-udan11-sql-parser-3.4.17-2b59d9e.tgz
diff --git a/makesrc.sh b/makesrc.sh
new file mode 100755
index 0000000..87d223d
--- /dev/null
+++ b/makesrc.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+NAME=$(basename $PWD)
+OWNER=$(sed   -n '/^%global gh_owner/{s/.* //;p}'   $NAME.spec)
+PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec)
+VERSION=$(sed -n '/^Version:/{s/.* //;p}'           $NAME.spec)
+COMMIT=$(sed  -n '/^%global gh_commit/{s/.* //;p}'  $NAME.spec)
+SHORT=${COMMIT:0:7}
+
+echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n"
+
+echo "Cloning..."
+rm -rf $PROJECT-$COMMIT
+git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT
+
+echo "Getting commit..."
+pushd $PROJECT-$COMMIT
+git checkout $COMMIT
+cp composer.json ../composer.json
+popd
+
+echo "Archiving..."
+tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT
+
+echo "Cleaning..."
+rm -rf $PROJECT-$COMMIT
+
+echo "Done."
diff --git a/php-udan11-sql-parser.spec b/php-udan11-sql-parser.spec
index 85fb251..8929c4d 100644
--- a/php-udan11-sql-parser.spec
+++ b/php-udan11-sql-parser.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    18a18d5106aa04ad7c7b79d9b92f123069ceea6e
+%global gh_commit    2b59d9e19432a385d952bcc94b3ffe6b11f22cbf
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     phpmyadmin
 #global gh_date      20150820
@@ -15,14 +15,15 @@
 %global psr0         SqlParser
 
 Name:           php-udan11-%{gh_project}
-Version:        3.4.16
+Version:        3.4.17
 Release:        1%{?gh_date?%{gh_date}git%{gh_short}}%{?dist}
 Summary:        A validating SQL lexer and parser with a focus on MySQL dialect
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            https://github.com/%{gh_owner}/%{gh_project}
-Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{?gh_short}.tar.gz
+Source0:        %{name}-%{version}-%{gh_short}.tgz
+Source1:        makesrc.sh
 
 # Use our autoloader
 Patch0:         %{name}-autoload.patch
@@ -36,7 +37,7 @@ BuildRequires:  php(language) >= 5.3.0
 BuildRequires:  php-composer(phpunit/phpunit)
 %endif
 # For autoloader
-BuildRequires:  php-fedora-autoloader-devel
+BuildRequires:  php-composer(fedora/autoloader)
 
 # From composer.json, "require": {
 #        "php": ">=5.3.0",
@@ -75,8 +76,14 @@ Autoloader: %{_datadir}/php/%{psr0}/autoload.php
 
 
 %build
-: generate an simple autoloader
-%{_bindir}/phpab --template fedora --output src/autoload.php src
+: Create autoloader
+cat <<'AUTOLOAD' | tee src/autoload.php
+<?php
+/* Autoloader for %{name} and its dependencies */
+require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php';
+
+\Fedora\Autoloader\Autoload::addPsr4('%{psr0}\\', __DIR__);
+AUTOLOAD
 
 
 %install
@@ -96,6 +103,7 @@ mkdir vendor
 cat << 'EOF' | tee vendor/autoload.php
 <?php
 require '%{buildroot}%{_datadir}/php/%{psr0}/autoload.php';
+\Fedora\Autoloader\Autoload::addPsr4('%{psr0}\\Tests\\', dirname(__DIR__).'/tests');
 EOF
 
 if %{_bindir}/phpunit --atleast-version 4.8; then
@@ -117,6 +125,11 @@ fi
 
 
 %changelog
+* Fri Jan 20 2017 Remi Collet <remi@fedoraproject.org> - 3.4.17-1
+- update to 3.4.17
+- sources from a git snapshot to retrieve test suite
+- switch to PSR-4 autoloader
+
 * Fri Jan  6 2017 Remi Collet <remi@fedoraproject.org> - 3.4.16-1
 - update to 3.4.16
 
diff --git a/sources b/sources
index 6099985..1095179 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sql-parser-3.4.16-18a18d5.tar.gz) = 66a0996effc78daf1d39c33d7536634e9e509d60c68210591c55c0509a3c9e950a4f4064a7e6c9f4639e94b013d14219d76955e9869a97eff65a661a3946ac8f
+SHA512 (php-udan11-sql-parser-3.4.17-2b59d9e.tgz) = f2d9dc4a8869618a20488dfac5e1c2d7239cca70e9b2421c09ccafaa2e1eaebeda01c9e51110f99b68ffbd667e5b7069a81576cf791a5a1856d62341395fae42