diff --git a/_service b/_service
index 8779f07..4a7ff8f 100644
--- a/_service
+++ b/_service
@@ -5,7 +5,8 @@
     <param name="scm">git</param>
     <param name="changesgenerate">enable</param>
     <param name="filename">rtl_433</param>
-    <param name="versionformat">0.0.1+git.%cd</param>
+    <param name="versionrewrite-pattern">v(.*)</param>
+    <param name="versionformat">@PARENT_TAG@+git.%cd</param>
   </service>
   <service mode="disabled" name="recompress">
     <param name="file">*.tar</param>
diff --git a/_servicedata b/_servicedata
index e816e20..5c40119 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
             <param name="url">https://github.com/merbanan/rtl_433.git</param>
-          <param name="changesrevision">9a9e2165c58a02f884632a52f3066b9b09f9aeed</param></service></servicedata>
\ No newline at end of file
+          <param name="changesrevision">602fbc0421613dcf844e437f4e0e7bfb783f393a</param></service></servicedata>
\ No newline at end of file
diff --git a/rtl_433-0.0.1+git.20180213.tar.xz b/rtl_433-0.0.1+git.20180213.tar.xz
deleted file mode 100644
index 2b22cf4..0000000
--- a/rtl_433-0.0.1+git.20180213.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c6f48bd74465a7afed10a7994271d4966b4adb902b1682f676f04e335491aa85
-size 176840
diff --git a/rtl_433-18.05+git.20180525.tar.xz b/rtl_433-18.05+git.20180525.tar.xz
new file mode 100644
index 0000000..1cf7d2d
--- /dev/null
+++ b/rtl_433-18.05+git.20180525.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a7273448289718deae84fcee214bc5a4111b06a0d51561dc7cfa1e041aa6f6b9
+size 184780
diff --git a/rtl_433.changes b/rtl_433.changes
index 6afa49a..dd88f3a 100644
--- a/rtl_433.changes
+++ b/rtl_433.changes
@@ -1,3 +1,40 @@
+-------------------------------------------------------------------
+Fri Jun 01 20:06:21 UTC 2018 - mardnh@gmx.de
+
+- Update to version 18.05+git.20180525:
+  * New devices: Euroster 3000TX, Elro DB270 (#683)
+  * Add flex spec for Byron BY doorbells (#686)
+  * change array separator in csv to ";" otherwise RadioHead ASK output will break csv parsers (#687)
+  * create flex dev adhoc and enable csv output (#688)
+  * calc stop_time late; better exit messages (#689)
+  * add proper reset and gap limit to Quhwa; use repeated rows; add csv output; style update (#691)
+  * fix short char buffer
+  * Adding interlogix devices driver (#649)
+  * fix bitbuffer_extract_bytes clipping unaligned bits
+  * fix Interlogix; style
+  * Added decoder for Dish Network UHF Remote 6.3 (#700)
+  * use actual max protocols
+  * Update acurite.c (#704)
+  * Acurite 06045M structured data (data_make) cleanup, decoding improvements. (#707)
+  * Adjust alarm from 1 second to 3 second
+  * Acurite 986 convert to JSON/data_make * Add hack from my branch to work around missing bit
+  * Fix typos/misspellings
+  * Add conversion hPA/inHG, kPa/PSI (#711)
+  * Fix acurite raw_str termination
+  * Touch up waveman code style, add missing time field
+  * Add PiWM decoding (#724)
+  * SimpliSafe Sensor (#721)
+  * SimpliSafe style updates
+  * Add Pacific PMV-C210 TMPS support (#717)
+  * Add preamble option to flex decoder
+  * Make intertechno decoder work with ITT-1500 (#694)
+  * Convert DSC to structured data (#725)
+  * Regularize and extend Acurite 6045M comments (#728)
+  * DSC data_make additions. (#730)
+  * Indents
+  * Acurite TXR/6045 fixes
+  * Acurite cosmetics fixes
+
 -------------------------------------------------------------------
 Mon Feb 26 21:15:42 UTC 2018 - mardnh@gmx.de
 
diff --git a/rtl_433.spec b/rtl_433.spec
index 7ad443e..e8941e5 100644
--- a/rtl_433.spec
+++ b/rtl_433.spec
@@ -1,6 +1,7 @@
 #
 # spec file for package rtl_433
 #
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2017, Martin Hauke <mardnh@gmx.de>
 #
 # All modifications and additions to the file contributed by third parties
@@ -16,25 +17,23 @@
 #
 
 
-%define version_unconverted 0.0.1+git.20180213
-
+%define version_unconverted 18.05+git.20180525
 Name:           rtl_433
-Version:        0.0.1+git.20180213
+Version:        18.05+git.20180525
 Release:        0
 Summary:        Turns RTL2832 dongle into a 433.92MHz generic data receiver
-License:        GPL-2.0
+License:        GPL-2.0-only
 Group:          Productivity/Hamradio/Other
-Url:            https://github.com/merbanan/rtl_433.git
+URL:            https://github.com/merbanan/rtl_433.git
 Source:         %{name}-%{version}.tar.xz
 Patch0:         rtl_433-disable-test.diff
 BuildRequires:  cmake
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(librtlsdr)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 An application using librtlsdr to decode the temperature from
-wireless temperature sensors (433.92MHz) 
+wireless temperature sensors (433.92MHz)
 
 %package devel
 Summary:        Turns RTL2832 dongle into a 433.92MHz generic data receiver
@@ -60,7 +59,8 @@ make VERBOSE=1 %{?_smp_mflags}
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING README.md
+%license COPYING
+%doc AUTHORS README.md
 %{_bindir}/rtl_433
 
 %files devel