diff --git a/ncl.spec b/ncl.spec
index 324df9a..e9ecbc4 100644
--- a/ncl.spec
+++ b/ncl.spec
@@ -1,6 +1,6 @@
 Name:           ncl
 Version:        6.6.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        NCAR Command Language and NCAR Graphics
 
 License:        BSD
@@ -25,6 +25,7 @@ Source3:        ncarg.sh
 # install paths are set up in Project. Paths used in code are also in 
 # Project, in NGENV_DESCRIPT.
 Patch0:         ncl-5.1.0-paths.patch
+# https://github.com/NCAR/ncl/pull/134
 Patch1:         ncarg-4.4.1-deps.patch
 Patch2:         ncl-5.1.0-ppc64.patch
 # Add needed -lm to ictrans build, remove unneeded -lrx -lidn -ldl from ncl
@@ -39,8 +40,10 @@ Patch5:         ncl-boz.patch
 Patch10:        ncl-5.0.0-no_install_dep.patch
 # put install and build rules before script rules such that the default rule
 # is all
+# https://github.com/NCAR/ncl/pull/135
 Patch11:        ncl-5.0.0-build_n_scripts.patch
 Patch12:        ncl-5.1.0-netcdff.patch
+# https://github.com/NCAR/ncl/pull/136
 Patch13:        ncl-5.1.0-includes.patch
 # Add Fedora secondary arches
 Patch16:        ncl-5.2.1-secondary.patch
@@ -189,13 +192,17 @@ make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -m 0644 ncarg.csh ncarg.sh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 # database, fontcaps, and graphcaps are arch dependent
-mv $RPM_BUILD_ROOT%{_datadir}/ncarg/{database,{font,graph}caps} \
-   $RPM_BUILD_ROOT%{_libdir}/ncarg/
+for x in {database,{font,graph}caps}
+do
+  mv $RPM_BUILD_ROOT%{_datadir}/ncarg/$x $RPM_BUILD_ROOT%{_libdir}/ncarg/
+  ln -s ../../%{_lib}/ncarg/$x $RPM_BUILD_ROOT%{_datadir}/ncarg/
+done
 # Compat links for what is left
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/ncarg
 for x in $RPM_BUILD_ROOT%{_datadir}/ncarg/*
 do
-  ln -s ../../share/ncarg/$(basename $x) $RPM_BUILD_ROOT%{_prefix}/lib/ncarg/
+  [ ! -e $RPM_BUILD_ROOT%{_prefix}/lib/ncarg/$(basename $x) ] &&
+    ln -s ../../share/ncarg/$(basename $x) $RPM_BUILD_ROOT%{_prefix}/lib/ncarg/
 done
 # Use system udunits
 rm -r $RPM_BUILD_ROOT%{_datadir}/ncarg/udunits
@@ -263,11 +270,19 @@ done
 %{_libdir}/ncarg/database/
 %{_libdir}/ncarg/fontcaps/
 %{_libdir}/ncarg/graphcaps/
+%if "%{_lib}" != "lib"
+%{_prefix}/lib/ncarg/database
+%{_prefix}/lib/ncarg/fontcaps
+%{_prefix}/lib/ncarg/graphcaps
+%endif
 
 %files common
 %dir %{_datadir}/ncarg
 %{_datadir}/ncarg/colormaps/
 %{_datadir}/ncarg/data/
+%{_datadir}/ncarg/database
+%{_datadir}/ncarg/fontcaps
+%{_datadir}/ncarg/graphcaps
 %{_datadir}/ncarg/grib2_codetables/
 %{_datadir}/ncarg/grib2_codetables.previous/
 %{_datadir}/ncarg/nclscripts/
@@ -336,6 +351,9 @@ done
 
 
 %changelog
+* Fri Jun  5 2020 Orion Poplawski <orion@nwra.com> - 6.6.2-10
+- Add extra needed symlinks to /usr/lib/ncarg (bz#1288083)
+
 * Thu Jun  4 2020 Orion Poplawski <orion@nwra.com> - 6.6.2-9
 - Fix format patch