diff --git a/libevent-rpmlintrc b/libevent-rpmlintrc
new file mode 100644
index 0000000..6eb5f79
--- /dev/null
+++ b/libevent-rpmlintrc
@@ -0,0 +1,3 @@
+# libevent-devel-static is a proper name in this package, in analogy to
+# libevent-devel
+addFilter("libevent-devel-static.*: W: shlib-policy-missing-lib")
diff --git a/libevent.changes b/libevent.changes
index 5a180a5..aa75a6f 100644
--- a/libevent.changes
+++ b/libevent.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Tue Jul 10 16:19:03 UTC 2018 - mrostecki@suse.com
+
+- Make use of %license macro
+
+-------------------------------------------------------------------
+Tue Jun 12 14:50:53 UTC 2018 - mrostecki@suse.com
+
+- Add devel-static package, which is needed for building Envoy
+  (https://www.envoyproxy.io/) and Cilium with Envoy integration
+- Fix an error about /usr/bin/env shebang in event_rpcgen.py 
+  * python2-shebang.patch
+
 -------------------------------------------------------------------
 Mon Oct  2 21:13:04 UTC 2017 - jengelh@inai.de
 
diff --git a/libevent.spec b/libevent.spec
index fa903a0..7fdeaf3 100644
--- a/libevent.spec
+++ b/libevent.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libevent
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -33,7 +33,9 @@ Url:            http://libevent.org/
 Source0:        https://github.com/%{name}/%{name}/releases/download/release-%{version}-%{version_suffix}/%{name}-%{version}-%{version_suffix}.tar.gz
 Source1:        https://github.com/%{name}/%{name}/releases/download/release-%{version}-%{version_suffix}/%{name}-%{version}-%{version_suffix}.tar.gz.asc
 Source2:        %{name}.keyring
+Source3:        libevent-rpmlintrc
 Source99:       baselibs.conf
+Patch0:         python2-shebang.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -96,13 +98,26 @@ signals or regular timeouts.
 
 This package holds the development files for libevent2.
 
+%package devel-static
+Summary:        Static libraries for libevent2
+Group:          Development/Libraries/C and C++
+Requires:       %{name}-devel = %{version}
+
+%description devel-static
+The libevent API provides a mechanism to execute a callback function
+when a specific event occurs on a file descriptor or after a timeout
+has been reached. Furthermore, libevent also support callbacks due to
+signals or regular timeouts.
+
+This package holds the static libraries for libevent2.
+
 %prep
 %setup -q  -n %{name}-%{version}-%{version_suffix}
+%patch0 -p1
 
 %build
 ./autogen.sh
 %configure \
-	--disable-static \
 	--disable-libevent-regress
 make %{?_smp_mflags}
 
@@ -119,7 +134,8 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 
 %files -n %{libsoname}
 %defattr(-,root,root,-)
-%doc ChangeLog LICENSE whatsnew-2.0.txt whatsnew-2.1.txt
+%license LICENSE
+%doc ChangeLog whatsnew-2.0.txt whatsnew-2.1.txt
 %{_libdir}/%{name}-%{version_base}.%{version_minor}.so.%{abi_release}*
 %{_libdir}/%{name}_core-%{version_base}.%{version_minor}.so.%{abi_release}*
 %{_libdir}/%{name}_extra-%{version_base}.%{version_minor}.so.%{abi_release}*
@@ -146,4 +162,12 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -delete -print
 %{_libdir}/pkgconfig/%{name}_core.pc
 %{_libdir}/pkgconfig/%{name}_extra.pc
 
+%files devel-static
+%defattr(-,root,root)
+%{_libdir}/%{name}.a
+%{_libdir}/%{name}_core.a
+%{_libdir}/%{name}_extra.a
+%{_libdir}/%{name}_openssl.a
+%{_libdir}/%{name}_pthreads.a
+
 %changelog
diff --git a/python2-shebang.patch b/python2-shebang.patch
new file mode 100644
index 0000000..ae6a765
--- /dev/null
+++ b/python2-shebang.patch
@@ -0,0 +1,27 @@
+From 293f2e5274ff62edcc1d49ba5439af3d986dfe3b Mon Sep 17 00:00:00 2001
+From: Michal Rostecki <mrostecki@suse.com>
+Date: Tue, 12 Jun 2018 16:41:36 +0200
+Subject: [PATCH] Use python2 instead of env as an interpreter
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+For the rpm runtime dependency detection to work, the shebang
+`#!/usr/bin/env python2`  needs to be patched into
+´#!/usr/bin/python2`, otherwise the package dependency generator
+merely adds a dependency on /usr/bin/env rather than the actual
+interpreter /usr/bin/python2.
+---
+ event_rpcgen.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/event_rpcgen.py b/event_rpcgen.py
+index 9baf73026..0cf34f08a 100755
+--- a/event_rpcgen.py
++++ b/event_rpcgen.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python2
++#!/usr/bin/python2
+ #
+ # Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu>
+ # Copyright (c) 2007-2012 Niels Provos and Nick Mathewson