diff --git a/crda-1.1.3.tar.bz2 b/crda-1.1.3.tar.bz2
deleted file mode 100644
index ee22bec..0000000
--- a/crda-1.1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:aa8a7fe92f0765986c421a5b6768a185375ac210393df0605ee132f6754825f0
-size 38697
diff --git a/crda-3.18.tar.xz b/crda-3.18.tar.xz
new file mode 100644
index 0000000..eee0108
--- /dev/null
+++ b/crda-3.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf
+size 61516
diff --git a/crda.changes b/crda.changes
index c1868cd..8ac8ef8 100644
--- a/crda.changes
+++ b/crda.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Sun Jun 28 10:57:08 UTC 2015 - seife+obs@b1-systems.com
+
+- update to version 3.18:
+  * user visible: add pubkey of new wireless-regdb maintainer to
+    make crda work at all with newer wireless-regdb
+  * synchronize code with latest kernel changes
+  * crda: add AUTO-BW rule flag support
+  * crda: parse/print CAC time
+  * code restructuring and bug fixes
+  *** License is now copyleft-next-0.3.0 ***
+- packaging:
+  * add V=1 to make calls for rpmlint happiness
+  * use %%optflags for compilation
+  * shared library libreg.so is now used by the tools
+
 -------------------------------------------------------------------
 Sun Nov 24 20:21:37 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/crda.spec b/crda.spec
index 49e6c09..b81447c 100644
--- a/crda.spec
+++ b/crda.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package crda
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,11 +22,11 @@ Url:            http://linuxwireless.org/en/developers/Regulatory/CRDA
 
 Name:           crda
 Summary:        802.11 central regulatory domain agent
-License:        ISC
+License:        SUSE-Copyleft-Next-0.3.0
 Group:          Hardware/Wifi
-Version:        1.1.3
+Version:        3.18
 Release:        0
-Source:         http://linuxwireless.org/download/%{name}/%{name}-%{version}.tar.bz2
+Source:         http://kernel.org/pub/software/network/crda/crda-%{version}.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  libgcrypt-devel
 BuildRequires:  pkg-config
@@ -44,21 +44,30 @@ through udev.
 
 %prep
 %setup -q
+# make install calls 'ldconfig' and fails if it cannot run it...
+ln -s /bin/true ldconfig
 
 %build
-make all_noverify %{?_smp_mflags}
+export CFLAGS="%{optflags}"
+make all_noverify %{?_smp_mflags} V=1
 
 %install
-make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} install
+# to find ldconfig...
+export PATH=.:$PATH
+make DESTDIR=$RPM_BUILD_ROOT SBINDIR=%{_sbindir}/ UDEV_RULE_DIR=%{_udevrulesdir} LIBDIR=%{_libdir} install
 #UsrMerge
 mkdir $RPM_BUILD_ROOT/sbin
 ln -sf %{_sbindir}/{crda,regdbdump} $RPM_BUILD_ROOT/sbin
 #EndUserMerge
 
+# clean up unneeded stuff...
+rm -r %{buildroot}/usr/include/reglib
+
 %files
 %defattr(-,root,root)
 %_sbindir/crda
 %_sbindir/regdbdump
+%_libdir/libreg.so
 #UsrMerge
 /sbin/crda
 /sbin/regdbdump