diff --git a/.gitignore b/.gitignore
index 0fab192..cb1a652 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,13 @@
 clog
-*spec~
+php-markdown.spec~
 php-markdown-1.0.1n.zip
 /php-markdown-1.0.1p.zip
 /php-markdown-1.0.1q.zip
 /php-markdown-lib-1.3.zip
+/php-markdown-1.0.2.zip
+/php-markdown-lib-1.4.0.zip
+/php-markdown-lib-1.4.1.zip
+/php-markdown-lib-1.5.0.zip
+/php-markdown-lib-1.6.0.zip
+/php-markdown-lib-1.7.0.zip
+/php-markdown-lib-1.8.0.zip
diff --git a/php-markdown.spec b/php-markdown.spec
index 3f36261..25d657c 100644
--- a/php-markdown.spec
+++ b/php-markdown.spec
@@ -1,24 +1,35 @@
-# Yes ugly: tarball version is not library version
-%global tarball_version   1.3
+# Fedora spec file for php-markdown
+#
+# License: MIT
+# http://opensource.org/licenses/MIT
+#
+# Please preserve changelog entries
+#
+
 # We still provide the classic library, for now
-%global classic_version   1.0.1q
+%global classic_version   1.0.2
 
 Name:        php-markdown
-Version:     1.2.7
+Version:     1.8.0
 Release:     1%{?dist}
 Summary:     Markdown implementation in PHP
 
 Group:       Development/Languages
 License:     BSD
-URL:         http://michelf.com/projects/php-markdown/
-Source0:     http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{tarball_version}.zip
+URL:         https://michelf.ca/projects/php-markdown/
+Source0:     http://littoral.michelf.ca/code/php-markdown/%{name}-lib-%{version}.zip
 Source1:     http://littoral.michelf.ca/code/php-markdown/%{name}-%{classic_version}.zip
 
-BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:   noarch
+BuildRequires: php-fedora-autoloader-devel
+# For tests
+BuildRequires: php-cli
 
 Requires:    php(language) >= 5.3
 Requires:    php-pcre
+Requires:    php-composer(fedora/autoloader)
+
+Provides:    php-composer(michelf/php-markdown) = %{version}
 
 
 %description
@@ -26,27 +37,35 @@ This is a PHP implementation of John Gruber's Markdown.
 It is almost completely compliant with the reference implementation.
 
 This packages provides the classic version %{classic_version} and the new
-library version %{version} (distributed in the %{tarball_version} archive).
+library version %{version}.
+
+Autoloader: %{_datadir}/php/Michelf/markdown-autoload.php
 
 
 %prep
 %setup -q -n 'PHP Markdown Lib %{version}' -a 1
 
-# documentation
-mkdir library
-mv License.* Readme.* library
-mkdir classic
+# documentation and licenses
+mkdir -p library lic/library
+mv Readme.* composer.json library
+mv License.* lic/library
+
+mkdir -p classic lic/classic
 cd "PHP Markdown %{classic_version}"
-mv License.text ../classic
+mv License.text ../lic/classic
 mv "PHP Markdown Readme.text" ../classic/Readme.text
 
 
 %build
-# Empty build
+# Generate simple autoloader
+%{_bindir}/phpab \
+    --template fedora \
+    --output Michelf/markdown-autoload.php \
+    Michelf
+cat Michelf/markdown-autoload.php
 
 
 %install
-rm -rf %{buildroot}
 install -d %{buildroot}%{_datadir}/php/
 
 # PSR-0 library
@@ -55,19 +74,53 @@ cp -pr Michelf %{buildroot}%{_datadir}/php/Michelf
 # Old classic
 install -p -m 644 "PHP Markdown %{classic_version}/markdown.php" %{buildroot}%{_datadir}/php/
 
-%clean
-rm -rf %{buildroot}
+
+%check
+php -r '
+require_once "%{buildroot}%{_datadir}/php/Michelf/markdown-autoload.php";
+  $ver = Michelf\Markdown::MARKDOWNLIB_VERSION;
+  echo "Version=$ver, expected=%{version}\n";
+  return (version_compare($ver, "%{version}", "=") ? 0 : 1);
+'
 
 
 %files
-%defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license lic/*
 %doc library classic
+# Classic version
 %{_datadir}/php/markdown.php
+# Library version
 %{_datadir}/php/Michelf
 
 
 %changelog
-* Sat Jun 15 2013 Remi Collet <remi@fedoraproject.org> - 1.2.7
+* Mon Jan 15 2018 Remi Collet <remi@remirepo.net> - 1.8.0-1
+- Mardown PSR-0/PSR-4 library version 1.8.0
+
+* Sun Oct 30 2016 Remi Collet <remi@fedoraproject.org> - 1.7.0-1
+- Mardown PSR-0 library version 1.7.0
+- switch to fedora/autoloader
+- add minimal %%check for version and autoloader
+
+* Sat Dec 26 2015 Remi Collet <remi@fedoraproject.org> - 1.6.0-1
+- Mardown PSR-0 library version 1.6.0
+- add simple autoloader
+
+* Mon Mar  2 2015 Remi Collet <remi@fedoraproject.org> - 1.5.0-1
+- Mardown PSR-0 library version 1.5.0
+- fix license handling
+- add provides php-composer(michelf/php-markdown)
+- fix project URL
+
+* Tue May  6 2014 Remi Collet <remi@fedoraproject.org> - 1.4.1-1
+- Mardown PSR-0 library version 1.4.1
+
+* Mon Dec 02 2013 Remi Collet <remi@fedoraproject.org> - 1.4.0-1
+- Mardown PSR-0 library version 1.4.0 (sources 1.2.8)
+- Mardown classic library version 1.0.2
+
+* Sat Jun 15 2013 Remi Collet <remi@fedoraproject.org> - 1.2.7-1
 - Mardown PSR-0 library version 1.2.7 (added)
 - Mardown classic library version 1.0.1q (updated)
 
diff --git a/sources b/sources
index 9df7ada..ebec71d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-4a74c6d7e8dbc1d3674a813439c088e6  php-markdown-1.0.1q.zip
-09d2c2ceabd39f40680dc134dbc7fd0a  php-markdown-lib-1.3.zip
+SHA512 (php-markdown-1.0.2.zip) = b876cd3196a532f28f9a942ec04bcc0766bc804f9f2918291109943847117c5532dce0f06ad9ae535efa55de57d88a8a4a9537c3bb47ef104c3901c014604dfa
+SHA512 (php-markdown-lib-1.8.0.zip) = 2b38d52f10cc74abfb787c1d01237fca6c4da9e4681e9c2999d70af7100a4759d45c73a5dff4b48f5d237d3e0c9aec4f918593e7dfb4517ca73c7ec12429b523