diff --git a/texlive.spec b/texlive.spec
index 9fc09c7..ad42938 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -1,6 +1,6 @@
 %global source_date 20150728_r37987
 %global tl_version 2015
-%global tl_rel 19
+%global tl_rel 20
 %global tl_release %{tl_rel}.%{source_date}%{?dist}
 %global tl_noarch_release %{tl_rel}%{?dist}
 %global source_name texlive-%{source_date}-source
@@ -66174,6 +66174,7 @@ Requires: tex(bitset.sty)
 Requires: tex(atbegshi.sty)
 Requires: tex(refcount.sty)
 Requires: tex(gettitlestring.sty)
+Requires: tex(pzdr.tfm)
 Provides: tex(backref.sty) = %{tl_version}
 Provides: tex(hdvipdfm.def) = %{tl_version}
 Provides: tex(hdvips.def) = %{tl_version}
@@ -90254,6 +90255,9 @@ Summary: Font containing web-related icons
 Version: svn38051.4.4.0
 Release: %{tl_noarch_release}
 BuildArch: noarch
+# This is a bit of a lie, but I don't want someone who installs texlive-fontawesome to wonder where their 
+# system fonts are.
+Requires: fontawesome-fonts
 Requires: texlive-base
 Requires: texlive-kpathsea-bin, tex-kpathsea
 Requires: texlive-tetex-bin, tex-tetex
@@ -286614,7 +286618,8 @@ patch -p0 < %{_sourcedir}/texlive-latexdiff-perl518.patch
 popd
 
 # make opentype fontdir symlinks
-# NOTE: We might have to handle this differently if there are conflicts.
+# NOTE: fontawesome is a conflict, so we just Requires: fontawesome-fonts for it
+# NOTE: We might have to handle this differently if there are lots of conflicts.
 mkdir -p %{buildroot}%{_datadir}/fonts
 pushd %{buildroot}%{_datadir}/fonts
 for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \
@@ -286626,7 +286631,7 @@ for i in adobe/sourcecodepro adobe/sourcesanspro adobe/sourceserifpro \
         public/Asana-Math public/baskervaldx public/ccicons public/cm-unicode \
         public/cyklop public/dantelogo public/drm public/ebgaramond \
         public/erewhon public/fandol public/fbb public/fdsymbol public/fetamont \
-        public/fira public/fontawesome public/gfsartemisia public/gfsbaskerville \
+        public/fira public/gfsartemisia public/gfsbaskerville \
         public/gfsbodoni public/gfscomplutum public/gfsdidot \
         public/gfsneohellenic public/gfsporson public/gfssolomos public/gnu-freefont \
         public/heuristica public/inconsolata public/libertine public/lilyglyphs \
@@ -347488,7 +347493,6 @@ fi
 %files fontawesome
 %defattr(-,root,root)
 %doc lppl1.3.txt
-%{_datadir}/fonts/fontawesome
 %{_texdir}/texmf-dist/fonts/enc/dvips/fontawesome/fontawesomeone.enc
 %{_texdir}/texmf-dist/fonts/enc/dvips/fontawesome/fontawesomethree.enc
 %{_texdir}/texmf-dist/fonts/enc/dvips/fontawesome/fontawesometwo.enc
@@ -443490,6 +443494,10 @@ fi
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Mon Jan 18 2016 Tom Callaway <spot@fedoraproject.org> - 5:2015-20.20150728_r37987
+- add Requires: tex(pzdr.tfm) to hyperref (bz1299422)
+- fix texlive-fontawesome opentype font handling (bz1299199)
+
 * Thu Jan 14 2016 Tom Callaway <spot@fedoraproject.org> - 5:2015-19.20150728_r37987
 - fix pdfjam-bin to have Requires: tex(pdfpages.sty) (bz1296265)
 - fix pstricks to have Requires: texlive-pst-tools (bz1294634)