diff --git a/.gitignore b/.gitignore
index 2bc6ecf..00baf48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7955,3 +7955,7 @@
 /fvextra.tar.xz
 /translator.tar.xz
 /translator.doc.tar.xz
+/autoaligne.tar.xz
+/autoaligne.doc.tar.xz
+/tikz-page.doc.tar.xz
+/tikz-page.tar.xz
diff --git a/sources b/sources
index 3254b4f..2e68744 100644
--- a/sources
+++ b/sources
@@ -5803,3 +5803,7 @@ SHA512 (fvextra.doc.tar.xz) = 919cff94f930cb624723fdca66033df39fee4dfe391df4ec59
 SHA512 (fvextra.tar.xz) = 3526c3656124b15217161792f14f914dad2ec84af7ffd85f95654701c82e3be6bde304df0ca1ba8b4eb943122e731fe7c059a0d8ba7554f49a5401be6b709d8a
 SHA512 (translator.tar.xz) = 0e3763d64bd7a4930c59c5cae60129bbc4e8d332c118b05aac1c40fcc3a21f5f33891fab469cbb0981710a4841ea73d1825ddd60b5c97984b0391b2ed0c2e15b
 SHA512 (translator.doc.tar.xz) = cd7114b9dcb1bb8be08c49fdf44aa4df9b6a3ec172d9e8e4dd74313ebb14a2304ad10dfdfd964ee3aa4581ee98d69e488f055034fedbd95cbd9337f600325031
+SHA512 (autoaligne.tar.xz) = aa5913bbad1e62ae063a4e9fe039ce9ece4ac003a17a1154c9416fdd60d38fcc706d11ab9ffb279d2ff3fa8018066944c6d2a4db7e06355fac168ac9c3426dca
+SHA512 (autoaligne.doc.tar.xz) = 697acb43c273c9e0c16fa0ba15193aeb2937480d628c64aa9f9c41097305bbce99512066b08fbc0495ad81791b8b6ea6d7f9895e6e4676ef816d31410852146a
+SHA512 (tikz-page.doc.tar.xz) = 3bd8489c3eb5b801054d55af24c35be4aaea73a4844f8215b27018d492e647a4e2ef3c1b009e22c06cc8a2db15f74f57dd1711860cebdb3b3d228d6907f009a1
+SHA512 (tikz-page.tar.xz) = f1b4af96e033ec2c5a927160cb44d88b47bb1f4ce4fbda953e6a0c17877f8b1a5ea43b593197b241d4d5fe675e176faa2408ffd39e986b542ed5801a024819ac
diff --git a/texlive.spec b/texlive.spec
index 63f142b..ed9d016 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -8,7 +8,7 @@
 
 Name: texlive
 Version: %{tl_version}
-Release: 8%{?dist}
+Release: 9%{?dist}
 Epoch: 7
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -5896,6 +5896,10 @@ Source8030: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive
 Source8031: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive/fvextra.doc.tar.xz
 Source8032: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive/translator.tar.xz
 Source8033: http://ctan.sharelatex.com/tex-archive/systems/texlive/tlnet/archive/translator.doc.tar.xz
+Source8034: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/tikz-page.tar.xz
+Source8035: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/tikz-page.doc.tar.xz
+Source8036: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/autoaligne.doc.tar.xz
+Source8037: http://ctan.math.illinois.edu/systems/texlive/tlnet/archive/autoaligne.tar.xz
 
 
 %description
@@ -41847,8 +41851,8 @@ Requires: texlive-texloganalyser
 Requires: texlive-texosquery
 Requires: texlive-texware
 Requires: texlive-tie
-Requires: texlive-tlcockpit
-Requires: texlive-tlshell
+# Requires: texlive-tlcockpit
+# Requires: texlive-tlshell
 Requires: texlive-tpic2pdftex
 Requires: texlive-typeoutfileinfo
 Requires: texlive-web
@@ -171071,6 +171075,30 @@ into the language preferred by the user. This package is not
 intended to be used to automatically translate more than a few
 words.
 
+%package tikz-page
+Summary: Small macro to help building nice and complex layout materials
+Version: svn42039
+License: LPPL
+Requires: texlive-base texlive-kpathsea
+Provides: tex(tikz-page.sty) = %{tl_version}
+
+%description tikz-page
+The package provides a small macro to help building nice and
+complex layout materials.
+
+%package autoaligne
+Summary: Align terms and members in math expressions
+Version: svn43195
+License: LPPL
+Requires: texlive-base texlive-kpathsea
+Provides: tex(autoaligne-fr.tex) = %{tl_version}
+Provides: tex(autoaligne.sty) = %{tl_version}
+Provides: tex(autoaligne.tex) = %{tl_version}
+
+%description autoaligne
+This package allows to align terms and members between lines
+containing math expressions.
+
 %prep
 %setup -q -c -T -a 3
 cp %{SOURCE7597} .
@@ -176933,6 +176961,10 @@ xz -dc %{SOURCE8030} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE8031} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE8032} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 xz -dc %{SOURCE8033} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+xz -dc %{SOURCE8034} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+xz -dc %{SOURCE8035} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+xz -dc %{SOURCE8036} | tar x -C %{buildroot}%{_texdir}/texmf-dist
+xz -dc %{SOURCE8037} | tar x -C %{buildroot}%{_texdir}/texmf-dist
 
 # nuke useless tlmgr packaging stuff and doc droppings
 rm -rf %{buildroot}%{_texdir}/tlpkg/gpg/
@@ -201532,8 +201564,22 @@ ln -s %{_sysconfdir}/texlive/tex/generic/config/language.dat %{buildroot}%{_texd
 %doc %{_texdir}/texmf-dist/doc/latex/translator/
 %{_texdir}/texmf-dist/tex/latex/translator/
 
+%files tikz-page
+%license lppl1.3.txt
+%doc %{_texdir}/texmf-dist/doc/latex/tikz-page/
+%{_texdir}/texmf-dist/tex/latex/tikz-page/
+
+%files autoaligne
+%license lppl1.3.txt
+%doc %{_texdir}/texmf-dist/doc/generic/autoaligne/
+%{_texdir}/texmf-dist/tex/generic/autoaligne/
+
 %changelog
-* Mon May 14 2018 Than Ngo <than@redhat.com> - 7:2017-9
+* Tue May 15 2018 Tom Callaway <spot@fedoraproject.org> - 7:2017-9
+- add tikz-page, autoaligne
+- remove requires on tlcockpit/tlshell
+
+* Mon May 14 2018 Than Ngo <than@redhat.com> - 7:2017-8
 - fix inconsistent use of tabs and spaces in indentation
 - fix mangling shebang