diff --git a/texlive.spec b/texlive.spec
index 1f5a3d9..35e84b4 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -24,7 +24,7 @@
 
 Name: texlive
 Version: %{source_date}
-Release: 17%{?dist}
+Release: 18%{?dist}
 Epoch: %{tl_epoch}
 Summary: TeX formatting system
 Group: Applications/Publishing
@@ -12003,7 +12003,7 @@ Provides: tex-lm = %{epoch}:%{source_date}-%{release}
 Provides: tex-lm-doc = %{epoch}:%{source_date}-%{release}
 Provides: %{name}-lm-doc = %{epoch}:%{source_date}-%{release}
 Obsoletes: %{name}-lm-doc < %{tl_epoch}:%{source_date}
-License: GFSL
+License: LPPL
 Summary: Latin modern fonts in outline formats
 BuildArch: noarch
 Requires: texlive-base
@@ -13600,7 +13600,7 @@ Provides: tex-tex-gyre = %{epoch}:%{source_date}-%{release}
 Provides: tex-tex-gyre-doc = %{epoch}:%{source_date}-%{release}
 Provides: %{name}-tex-gyre-doc = %{epoch}:%{source_date}-%{release}
 Obsoletes: %{name}-tex-gyre-doc < %{tl_epoch}:%{source_date}
-License: GFSL
+License: LPPL
 Summary: TeX Fonts extending freely available URW fonts
 BuildArch: noarch
 Requires: texlive-base
@@ -25590,6 +25590,24 @@ install -m 644 %{SOURCE5} %{buildroot}%{_datadir}/appdata/
 # Replace arch-dependent header file with arch-independent stub
 %multilib_fix_c_header --file %{_includedir}/kpathsea/c-auto.h
 
+# Some (most) of the binaries are ending up with RPATH despite our best efforts.
+for i in afm2pl afm2tfm aleph bibtex bibtex8 bibtexu chkdvifont chktex ctie ctangle ctwill ctwill-refsort \
+         ctwill-twinx cweave detex disdvi dt2dv dv2dt dvi2tty dvibook dviconcat dvicopy dvilj dvilj2p dvilj4 \
+         dvilj4l dvipng dvipos dvips dviselect dvispc dvisvgm dvitodvi dvitype eptex euptex gftodvi gftopk \
+         gftype gregorio gsftopk hbf2gf kpsewhich luahbtex luatex mag makeindex makejvf mendex mf mflua mft \
+         mf-nowin mpost otftotfm msxlint odvicopy odvitype omfonts otangle otp2ocp outocp patgen pbibtex pdftex \
+         pdftosrc pktogf pdvitype pfb2pfa pk2bm pktype pltotf pmpost pooltype ppltotf ps2pk ptex ptftopl synctex \
+         t4ht tangle tex tex4ht tftopl tie tl-epsffit tl-psbook tl-psnup tl-psresize tl-psselect tl-pstops \
+         ttf2afm ttf2pk ttf2tfm ttfdump upbibtex updvitype upmendex upmpost uppltotf uptex uptftopl vftovp \
+         vptovf weave wofm2opl wopl2ofm wovf2ovp wovp2ovf xdvi-xaw xdvipdfmx xetex luajithbtex luajittex mfluajit; do
+   if [ -f %{buildroot}%{_bindir}/$i ] ; then
+      chrpath --delete %{buildroot}%{_bindir}/$i
+   fi
+done
+
+# And remove the rpath from this library.
+chrpath --delete %{buildroot}%{_libdir}/libptexenc.so.*
+
 # SCRIPTLETS
 %pretrans base -p <lua>
 path = "/usr/share/texmf"
@@ -28357,6 +28375,9 @@ done <<< "$list"
 %{_texdir}/texmf-dist/doc/latex/xpatch/
 
 %changelog
+* Fri May 28 2021 Than Ngo <than@redhat.com> - 9:20200327-18
+- Related: #1960650 - fixed license tags and rpath issue
+
 * Tue May 25 2021 Than Ngo <than@redhat.com> - 9:20200327-17
 - Resolves: #1960650 - Texlive is missing xpatch.sty