diff --git a/rpms/awips2.core/Installer.cli/component.spec b/rpms/awips2.core/Installer.cli/component.spec
index c724304c9f..c500b5ce72 100644
--- a/rpms/awips2.core/Installer.cli/component.spec
+++ b/rpms/awips2.core/Installer.cli/component.spec
@@ -74,11 +74,16 @@ cp -r %{_baseline_workspace}/${CLI_PROJECT_DIR}/impl/* ${RPM_BUILD_ROOT}/awips2/
 copyLegal "awips2/fxa"
 
 # Copy our profile.d scripts.
-PROFILE_D_DIRECTORY="rpms/awips2.core/Installer.cli/scripts/profile.d"
+CLI_DIRECTORY="rpms/awips2.core/Installer.cli"
+PROFILE_D_DIRECTORY="${CLI_DIRECTORY}/scripts/profile.d"
 mkdir -p ${RPM_BUILD_ROOT}/etc/profile.d
 cp %{_baseline_workspace}/${PROFILE_D_DIRECTORY}/* \
    ${RPM_BUILD_ROOT}/etc/profile.d
 
+# Copy fxa data files
+cp -r  %{_baseline_workspace}/${CLI_DIRECTORY}/fxa/* ${RPM_BUILD_ROOT}/awips2/fxa/
+
+
 %pre
 if [ "${1}" = "2" ]; then
    exit 0
@@ -130,5 +135,9 @@ rm -rf ${RPM_BUILD_ROOT}
 /etc/profile.d/awips2CLI.sh
 %defattr(755,awips,fxalpha,755)
 %dir /awips2/fxa/bin
+%dir /awips2/fxa/data
+%dir /awips2/fxa/nationalData
 %attr(755,awips,fxalpha) /awips2/fxa/bin/*
+%attr(755,awips,fxalpha) /awips2/fxa/data/*
+%attr(755,awips,fxalpha) /awips2/fxa/nationalData/*
 %config(noreplace) /awips2/fxa/bin/setup.env
diff --git a/rpms/build/x86_64/build.sh b/rpms/build/x86_64/build.sh
index dbae899c0c..e5c7b36b55 100644
--- a/rpms/build/x86_64/build.sh
+++ b/rpms/build/x86_64/build.sh
@@ -518,9 +518,9 @@ if [ "${1}" = "-cave" ]; then
 fi
 
 if [ "${1}" = "-other" ]; then
-   #buildRPM "awips2-cli"
+   buildRPM "awips2-cli"
    #buildRPM "awips2-yajsw"
-   buildRPM "awips2-hydroapps-shared" # disabled - removed from repo comps.xml
+   #buildRPM "awips2-hydroapps-shared" # disabled - removed from repo comps.xml
    #buildRPM "awips2-tools"
    #buildRPM "awips2-pypies"
    #buildRPM "awips2-adapt-native"