diff --git a/.gitignore b/.gitignore
index 041e2a3..d98a7a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 netsniff-ng-*.tar.gz
+/netsniff-ng-0.5.8.tar.xz
diff --git a/netsniff-ng-0.5.7-flags.patch b/netsniff-ng-0.5.7-flags.patch
deleted file mode 100644
index 1b3b786..0000000
--- a/netsniff-ng-0.5.7-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up netsniff-ng-0.5.7/src/CMakeLists.txt.orig netsniff-ng-0.5.7/src/CMakeLists.txt
---- netsniff-ng-0.5.7/src/CMakeLists.txt.orig	2012-07-30 15:54:43.000000000 +0200
-+++ netsniff-ng-0.5.7/src/CMakeLists.txt	2012-07-30 15:54:47.000000000 +0200
-@@ -22,8 +22,6 @@ ADD_DEFINITIONS(
- 	-fno-strict-aliasing
- 	-D_FORTIFY_SOURCE=2
- 	-D_REENTRANT
--	-march=native
--	-mtune=native
- 	-Wall
- 	-Wundef
- 	-Wstrict-prototypes
diff --git a/netsniff-ng-0.5.7-libcli-include-fix.patch b/netsniff-ng-0.5.7-libcli-include-fix.patch
deleted file mode 100644
index 7f2b147..0000000
--- a/netsniff-ng-0.5.7-libcli-include-fix.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff -up netsniff-ng-0.5.7/src/trafgen_cli.c.orig netsniff-ng-0.5.7/src/trafgen_cli.c
---- netsniff-ng-0.5.7/src/trafgen_cli.c.orig	2012-06-29 20:07:57.000000000 +0200
-+++ netsniff-ng-0.5.7/src/trafgen_cli.c	2012-07-02 10:01:52.324609913 +0200
-@@ -1,3 +1,4 @@
-+#include <sys/time.h>
- #include <libcli.h>
- 
- #include "trafgen_conf.h"
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index e5d8bee..e290f93 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -2,21 +2,16 @@
 %bcond_without nacl
 
 Name:		netsniff-ng
-Version:	0.5.7
-Release:	11%{?dist}
+Version:	0.5.8
+Release:	1%{?dist}
 Summary:	Packet sniffing beast
 Group:		Applications/Internet
 License:	GPLv2
 URL:		http://netsniff-ng.org/
-Source0:	http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.gz
-# Temporal workaround for rhbz#836923
-Patch0:	netsniff-ng-0.5.7-libcli-include-fix.patch
-# drop -march/-mtune=native (breaks binaries and doesn't work on all arches)
-Patch1:	netsniff-ng-0.5.7-flags.patch
-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:	cmake ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
-BuildRequires:	userspace-rcu-devel libnl-devel libcli-devel flex bison
-BuildRequires:	perl-podlators
+Source0:	http://www.netsniff-ng.org/pub/netsniff-ng/netsniff-ng-%{version}.tar.xz
+BuildRequires:	ncurses-devel GeoIP-devel libnetfilter_conntrack-devel
+BuildRequires:	userspace-rcu-devel libnl3-devel libcli-devel flex bison
+BuildRequires:	perl-podlators zlib-devel libpcap-devel libnet-devel
 %if %{with nacl}
 BuildRequires:	nacl-static
 %endif
@@ -39,30 +34,14 @@ netsniff-ng toolkit currently consists of the following utilities:
 
 %prep
 %setup -q
-%patch0 -p1 -b .libcli-include-fix
-%patch1 -p1 -b .flags
-
-%if %{with nacl}
-[ -r src/curvetun/nacl_path.cmake ] || \
-cat > src/curvetun/nacl_path.cmake <<":eof"
-SET(NACL_INCLUDE_DIR %{_includedir}/nacl)
-SET(NACL_LIB_DIR %{_libdir})
-:eof
-%endif
 
 %build
-cd src
-mkdir build
-cd build
-%cmake ..
-make  %{?_smp_mflags}
+%configure
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make -C src/build DESTDIR="%{buildroot}" install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install PREFIX=%{_usr} DESTDIR="%{buildroot}"
+mv %{buildroot}%{_usr}/etc %{buildroot}/etc
 
 %files
 %defattr(-, root, root, -)
@@ -73,6 +52,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/*
 
 %changelog
+* Tue May  6 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 0.5.8-1
+- New version
+  Resolves: rhbz#1092943
+- Switched to libnl3
+- Switched to xz archive format to save space
+- Fixed bogus date in changelog (best effort)
+- Dropped flags and libcli-include-fix patches (both not needed)
+
 * Wed Feb 12 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 0.5.7-11
 - Rebuilt due to liburcu update
 
@@ -168,6 +155,6 @@ rm -rf $RPM_BUILD_ROOT
 * Wed Jan 06 2010 James Findley <sixy@gmx.com> - 0.5.4.1-1
 - Updated to latest stable upstream
 
-* Mon Nov 27 2009 James Findley	<sixy@gmx.com> - 0.5.2-1
+* Fri Nov 27 2009 James Findley	<sixy@gmx.com> - 0.5.2-1
 - Initial Release
 
diff --git a/sources b/sources
index 021b629..5cfba14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d2da7a75d163f839129c9ebb8b0004d0  netsniff-ng-0.5.7.tar.gz
+df05687a7a791688a5275c63ad0cb1d6  netsniff-ng-0.5.8.tar.xz