diff --git a/libpsl-0.17.0.tar.gz b/libpsl-0.17.0.tar.gz
deleted file mode 100644
index e2be2e9..0000000
--- a/libpsl-0.17.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:025729d6a26ffd53cb54b4d86196f62c01d1813a4360c627546c6eb60ce3dd4b
-size 567193
diff --git a/libpsl-0.18.0.tar.gz b/libpsl-0.18.0.tar.gz
new file mode 100644
index 0000000..5987b50
--- /dev/null
+++ b/libpsl-0.18.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:91b0f7954709ced5d6ad44d0e2b872675300d834573a569bb516eb46916e3102
+size 10832049
diff --git a/libpsl.changes b/libpsl.changes
index 0d47356..e7e34bd 100644
--- a/libpsl.changes
+++ b/libpsl.changes
@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Jul 20 13:48:27 UTC 2017 - astieger@suse.com
+
+- update to 0.18.0:
+  * Fix order of files in psl_latest()
+  * Add fuzzing architecture
+  * Fix memleak in _psl_is_public_suffix()
+  * Add configure option --enable-asan (Address sanitizer)
+  * Add configure option --enable-usan (Undefined sanitizer)
+  * Add configure option --enable-cfi (Control Flow Integrity)
+  * Fix finding libidn2 for static builds
+  * Fix use of uninitialized stack value
+  * Fix buffer overflow in libicu build
+  * Use libidn2 as default for builds (former libicu)
+  * Add pkg-config support for libidn and libidn2
+
 -------------------------------------------------------------------
 Thu Apr  6 14:41:26 UTC 2017 - coolo@suse.com
 
diff --git a/libpsl.spec b/libpsl.spec
index 33dedf2..681cc1c 100644
--- a/libpsl.spec
+++ b/libpsl.spec
@@ -19,10 +19,10 @@
 
 %define somajor 5
 Name:           libpsl
-Version:        0.17.0
+Version:        0.18.0
 Release:        0
 Summary:        C library for the Publix Suffix List
-License:        MIT and MPL-2.0 and BSD-3-Clause
+License:        MIT AND MPL-2.0 AND BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Url:            https://rockdaboot.github.io/libpsl
 Source:         https://github.com/rockdaboot/libpsl/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz
@@ -32,7 +32,6 @@ BuildRequires:  libunistring-devel
 BuildRequires:  pkgconfig >= 0.9.0
 BuildRequires:  publicsuffix
 BuildRequires:  python-base >= 2.7
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with gtk-doc}
 BuildRequires:  gtk-doc >= 1.15
 %endif
@@ -48,7 +47,7 @@ and sorting domain lists by site.
 %package -n %{name}%{somajor}
 Summary:        C library for the Publix Suffix List
 # The libary code is MIT, with built-in data from publicsuffix
-License:        MIT and MPL-2.0
+License:        MIT AND MPL-2.0
 Group:          System/Libraries
 Recommends:     publicsuffix
 
@@ -95,7 +94,7 @@ and sorting domain lists by site.
 %setup -q
 
 %build
-# default is libicu, but this just too heavy dependency. This library is part of the 
+# default is libicu, but this just too heavy dependency. This library is part of the
 # minimal system as curl uses it - but libidn2 is already used by curl directly, while
 # icu is not
 %configure \
@@ -105,14 +104,13 @@ and sorting domain lists by site.
 	--disable-runtime \
 	--disable-builtin \
 %endif
-	--enable-builtin=libidn2 --enable-runtime=libidn2 \
 	--with-psl-file=%{_datadir}/publicsuffix/public_suffix_list.dat \
 	--with-psl-distfile=%{_datadir}/publicsuffix/public_suffix_list.dafsa
 
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 # in psl-make-dafsa package to break build cycle
 make DESTDIR=%{buildroot} install-man
@@ -125,12 +123,10 @@ make %{?_smp_mflags} check || (cat tests/test-suite.log; exit 42)
 %postun -n %{name}%{somajor} -p /sbin/ldconfig
 
 %files -n %{name}%{somajor}
-%defattr(-,root,root)
 %doc COPYING
 %{_libdir}/libpsl.so.%{somajor}*
 
 %files devel
-%defattr(-,root,root)
 %doc AUTHORS NEWS COPYING
 %doc docs/libpsl/html
 %{_includedir}/libpsl.h
@@ -141,7 +137,6 @@ make %{?_smp_mflags} check || (cat tests/test-suite.log; exit 42)
 %endif
 
 %files -n psl
-%defattr(-,root,root)
 %doc AUTHORS NEWS COPYING
 %{_bindir}/psl
 %{_mandir}/man1/psl.1%{ext_man}
diff --git a/psl-make-dafsa.changes b/psl-make-dafsa.changes
index 89ec4de..17809ec 100644
--- a/psl-make-dafsa.changes
+++ b/psl-make-dafsa.changes
@@ -1,8 +1,14 @@
+-------------------------------------------------------------------
+Thu Jul 20 13:48:27 UTC 2017 - astieger@suse.com
+
+- update to 0.18.0:
+  * no changes for psl-make-dafsa 
+
 -------------------------------------------------------------------
 Thu Jan 19 15:07:22 UTC 2017 - shshyukriev@suse.com
 
 - update to 0.17.0:
- * no changes for psl-make-dafsa 
+  * no changes for psl-make-dafsa 
 
 -------------------------------------------------------------------
 Thu Dec 15 12:18:33 UTC 2016 - astieger@suse.com
diff --git a/psl-make-dafsa.spec b/psl-make-dafsa.spec
index a473bc5..479b4b9 100644
--- a/psl-make-dafsa.spec
+++ b/psl-make-dafsa.spec
@@ -18,7 +18,7 @@
 
 
 Name:           psl-make-dafsa
-Version:        0.17.0
+Version:        0.18.0
 Release:        0
 Summary:        Create a binary DAFSA from a Public Suffix List
 License:        BSD-3-Clause