diff --git a/.gitignore b/.gitignore
index 086c980..de8780f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 /crda-3.18.tar.xz
-/wireless-regdb-2018.05.09.tar.xz
+/wireless-regdb-2018.05.31.tar.xz
diff --git a/crda.spec b/crda.spec
index 952c5a4..94c20e3 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,5 +1,5 @@
 %define         crda_version    3.18
-%define         regdb_version   2018.05.09
+%define         regdb_version   2018.05.31
 
 %global         _firmwarepath	/usr/lib/firmware
 
@@ -10,7 +10,7 @@ Summary:        Regulatory compliance daemon for 802.11 wireless networking
 
 Group:          System Environment/Base
 License:        ISC
-URL:            http://www.linuxwireless.org/en/developers/Regulatory/CRDA
+URL:            http://wireless.kernel.org/en/developers/Regulatory/CRDA
 
 BuildRequires:  kernel-headers >= 2.6.27
 BuildRequires:  libnl3-devel
@@ -67,6 +67,7 @@ cd ../wireless-regdb-%{regdb_version}
 %patch3 -p2 -b .fwsign
 %patch4 -p2 -b .python
 
+
 %build
 export CFLAGS="%{optflags} -Wno-error=unused-const-variable"
 export LDFLAGS="%{?__global_ldflags}"
@@ -140,6 +141,10 @@ install -D -pm 0644 %SOURCE3 %{buildroot}%{_mandir}/man1/setregdomain.1
 
 
 %changelog
+* Tue May 29 2018 John W. Linville <linville@redhat.com> - 3.18_2018.05.31-1
+- Update wireless-regdb to version 2018.05.31
+- Update URL for package header
+
 * Tue May 29 2018 John W. Linville <linville@redhat.com> - 3.18_2018.05.09-1
 - Update wireless-regdb to version 2018.05.09
 - Ensure rebuild of regulatory.db after signature regeneration
diff --git a/sources b/sources
index 715b3f1..6abbf83 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (crda-3.18.tar.xz) = 57ae6309159f396448f052c127f401c2f63d47f4193e87dca231c4b7bbbd7e69b5e5666f356fc76dfc8a6ae58ffa55c3794428d6eb34d9937df77c4276036588
-SHA512 (wireless-regdb-2018.05.09.tar.xz) = 37b20960e82f48d25b441d2656f09687d9f16a55ca18be56f805c0d6a689454e2ec372ccaecec201799e6610d8275c0556a1e249bb8758d8964908b3a78d6c41
+SHA512 (wireless-regdb-2018.05.31.tar.xz) = fda18edd619b294b125a5c1e04e758c04332c6d1d99ed44574321753294c159bd6c6f0c592ebfd91e99d301467e8ee8b97d1ad595cd56b3902bd5f85acd95b8d