diff --git a/slurm.spec b/slurm.spec
index ef9587ec02fde23d151e5e0b3fe6b3910c43d8e4..2de94a3702e1cc555ae7f6a1dad2fe1683a80caf 100644
--- a/slurm.spec
+++ b/slurm.spec
@@ -387,11 +387,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/slurm/jobcomp_pgsql.so
 %{_libdir}/slurm/jobcomp_script.so
 %{_libdir}/slurm/jobcomp_slurmdbd.so
-%{_libdir}/slurm/nodeacct_storage_gold.so
-%{_libdir}/slurm/nodeacct_storage_mysql.so
-%{_libdir}/slurm/nodeacct_storage_none.so
-%{_libdir}/slurm/nodeacct_storage_pgsql.so
-%{_libdir}/slurm/nodeacct_storage_slurmdbd.so
+%{_libdir}/slurm/clusteracct_storage_gold.so
+%{_libdir}/slurm/clusteracct_storage_mysql.so
+%{_libdir}/slurm/clusteracct_storage_none.so
+%{_libdir}/slurm/clusteracct_storage_pgsql.so
+%{_libdir}/slurm/clusteracct_storage_slurmdbd.so
 %{_libdir}/slurm/proctrack_pgid.so
 %{_libdir}/slurm/proctrack_linuxproc.so
 %{_libdir}/slurm/sched_backfill.so
diff --git a/src/plugins/jobacct_storage/Makefile.am b/src/plugins/jobacct_storage/Makefile.am
index 4c228e189668ed3c9c2eeef64a75d082de5a7b46..c4879b80a208207af8b0cf26f21d70df56678ecd 100644
--- a/src/plugins/jobacct_storage/Makefile.am
+++ b/src/plugins/jobacct_storage/Makefile.am
@@ -1,3 +1,3 @@
 # Makefile for storage plugins
 
-SUBDIRS = filetxt mysql pgsql none slurmdbd
+SUBDIRS = filetxt gold mysql pgsql none slurmdbd
diff --git a/src/plugins/jobacct_storage/Makefile.in b/src/plugins/jobacct_storage/Makefile.in
index f4a55265b06978c4fafa54457745c2609603fc5d..a81e3dd6564efb6d3faa97feec813a81ef84b6e4 100644
--- a/src/plugins/jobacct_storage/Makefile.in
+++ b/src/plugins/jobacct_storage/Makefile.in
@@ -243,7 +243,7 @@ target_os = @target_os@
 target_vendor = @target_vendor@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = filetxt mysql pgsql none slurmdbd
+SUBDIRS = filetxt gold mysql pgsql none slurmdbd
 all: all-recursive
 
 .SUFFIXES: