diff --git a/macros b/macros
index d928069..fb8eb55 100644
--- a/macros
+++ b/macros
@@ -63,7 +63,12 @@
 	--infodir=%{_infodir}
 
 # Maximum number of CPU's to use when building, 0 for unlimited.
-%_smp_ncpus_max 16
+#
+# This was for some time capped at 16.  Please see
+# https://bugzilla.redhat.com/show_bug.cgi?id=669638 and
+# https://bugzilla.redhat.com/show_bug.cgi?id=1384938 for the situation
+# surrounding this.
+#%_smp_ncpus_max 0
 %_smp_mflags %([ -z "$RPM_BUILD_NCPUS" ] \\\
 	&& RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\
         ncpus_max=%{?_smp_ncpus_max}; \\\
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 4941d2b..f8eaa84 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -6,7 +6,7 @@
 
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
-Version: 48
+Version: 49
 Release: 1%{?dist}
 # No version specified.
 License: GPL+
@@ -144,6 +144,10 @@ install -p -m 755 -t %{buildroot}%{_rpmconfigdir} kmod.prov
 %{_rpmconfigdir}/macros.d/macros.kmp
 
 %changelog
+* Mon Oct 17 2016 Jason L Tibbitts III <tibbs@math.uh.edu> - 49-1
+- Remove hardcoded limit of 16 CPUs for makefile parallelism.
+- See https://bugzilla.redhat.com/show_bug.cgi?id=1384938
+
 * Thu Oct 13 2016 Richard W.M. Jones <rjones@redhat.com> 48-1
 - Add support for riscv64.
   This also updates config.sub/config.guess to the latest upstream versions.