diff --git a/crda.spec b/crda.spec
index fe4e624..e9288fc 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,6 +1,8 @@
 %define         crda_version    3.18
 %define         regdb_version   2017.12.23
 
+%global         _firmwarepath	/usr/lib/firmware
+
 Name:           crda
 Version:        %{crda_version}_%{regdb_version}
 Release:        1%{?dist}
@@ -66,7 +68,8 @@ export LDFLAGS="%{?__global_ldflags}"
 cd wireless-regdb-%{regdb_version}
 
 make %{?_smp_mflags} maintainer-clean
-make %{?_smp_mflags} REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem
+make %{?_smp_mflags} REGDB_PRIVKEY=key.priv.pem REGDB_PUBKEY=key.pub.pem \
+	FIRMWARE_PATH=%{_firmwarepath}
 
 # Build CRDA using the new key and regulatory.bin from above
 cd ../crda-%{crda_version}
@@ -88,7 +91,8 @@ make install DESTDIR=%{buildroot} MANDIR=%{_mandir}/ \
 cd ../wireless-regdb-%{regdb_version}
 cp LICENSE LICENSE.wireless-regdb
 cp README README.wireless-regdb
-make install DESTDIR=%{buildroot} MANDIR=%{_mandir}
+make install DESTDIR=%{buildroot} MANDIR=%{_mandir} \
+	FIRMWARE_PATH=%{_firmwarepath}
 
 install -D -pm 0755 %SOURCE2 %{buildroot}%{_sbindir}
 install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1
@@ -104,10 +108,13 @@ install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1
 %{_sbindir}/setregdomain
 %{_libdir}/libreg.so
 /lib/udev/rules.d/85-regulatory.rules
-# location of database is hardcoded to /usr/lib/%{name}
+# location of database is hardcoded to /usr/lib/%%{name}
 /usr/lib/%{name}
+%{_firmwarepath}/regulatory.db
+%{_firmwarepath}/regulatory.db.p7s
 %{_mandir}/man1/setregdomain.1*
 %{_mandir}/man5/regulatory.bin.5*
+%{_mandir}/man5/regulatory.db.5*
 %{_mandir}/man8/crda.8*
 %{_mandir}/man8/regdbdump.8*
 %license crda-%{crda_version}/LICENSE.crda
@@ -126,6 +133,7 @@ install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1
 %changelog
 * Mon Apr 30 2018 John W. Linville <linville@redhat.com> - 3.18_2017.12.23-1
 - Update wireless-regdb to version 2017.12.23
+- Install regulatory.db into firmware directory for loading by kernel itself
 
 * Thu Mar 15 2018 Iryna Shcherbina <ishcherb@redhat.com> - 3.18_2016.02.08-8
 - Update Python 2 dependency declarations to new packaging standards