diff --git a/netsniff-ng-0.6.3.tar.xz b/netsniff-ng-0.6.3.tar.xz
deleted file mode 100644
index 89c1c0a..0000000
--- a/netsniff-ng-0.6.3.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f8e0094f77de8a70f91240bfa77137d5631ac48138cb29fcf962c0bcbe81f04a
-size 577752
diff --git a/netsniff-ng-0.6.4.tar.xz b/netsniff-ng-0.6.4.tar.xz
new file mode 100644
index 0000000..5ba2a3e
--- /dev/null
+++ b/netsniff-ng-0.6.4.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd67150e0954b7079b6d0c72fb0ef1f34091357ad559b45c68e8752376bdc307
+size 584120
diff --git a/netsniff-ng-fix-ncurses.diff b/netsniff-ng-fix-ncurses.diff
index 556b1c0..009b198 100644
--- a/netsniff-ng-fix-ncurses.diff
+++ b/netsniff-ng-fix-ncurses.diff
@@ -1,26 +1,26 @@
 diff --git a/configure b/configure
-index 72bb574..44aa591 100755
+index d5fe7e6..56148ac 100755
 --- a/configure
 +++ b/configure
-@@ -403,9 +403,9 @@ int main(void)
+@@ -428,9 +428,9 @@ int main(void)
  EOF
  
  	$CC \
 -		$($PKG_CONFIG --cflags ncurses 2>> config.log) \
-+		$(ncurses5-config --cflags ncurses 2>> config.log) \
++		$(ncurses5-config --cflags 2>> config.log) \
  		-o $TMPDIR/ncursestest $TMPDIR/ncursestest.c \
 -		$($PKG_CONFIG --libs ncurses 2>> config.log \
-+		$(ncurses5-config --libs ncurses 2>> config.log \
++		$(ncurses5-config --libs 2>> config.log \
  	          || echo '-lncurses' ) \
  			>> config.log 2>&1
  	if [ ! -x $TMPDIR/ncursestest ] ; then
 diff --git a/flowtop/Makefile b/flowtop/Makefile
-index effe7eb..ab49a51 100644
+index e001ce8..bffd86e 100644
 --- a/flowtop/Makefile
 +++ b/flowtop/Makefile
 @@ -1,8 +1,7 @@
  flowtop-libs =	-lurcu \
- 		-lnetfilter_conntrack \
+ 		$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs libnetfilter_conntrack 2> /dev/null ) \
 -		$(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) $(PKG_CONFIG) --libs ncurses 2> /dev/null \
 +		$(shell ncurses5-config --libs 2> /dev/null \
  			|| echo '-lncurses') \
diff --git a/netsniff-ng.changes b/netsniff-ng.changes
index 832ad41..62575ea 100644
--- a/netsniff-ng.changes
+++ b/netsniff-ng.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Jan  5 21:54:23 UTC 2018 - mardnh@gmx.de
+
+- Update to version 0.6.4
+  * DNS header generation in trafgen
+  * Support for dumping proto headers in trafgen
+  * Fixes for dinc()/ddec() to properly respect min/max range and
+    avoid counter corruption
+  * Fixes for NULL pointer dereferences and resource leaks in trafgen
+  * Build fixes for various compiler versions, libc implementations
+    and distributions
+- Rebase patch:
+  * netsniff-ng-fix-ncurses.diff
+
 -------------------------------------------------------------------
 Thu Jun  1 20:57:59 UTC 2017 - mardnh@gmx.de
 
diff --git a/netsniff-ng.spec b/netsniff-ng.spec
index 8e085fb..7fb3fd0 100644
--- a/netsniff-ng.spec
+++ b/netsniff-ng.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package netsniff-ng
 #
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
 
 
 Name:           netsniff-ng
-Version:        0.6.3
+Version:        0.6.4
 Release:        0
 Summary:        Network Sniffer for Packet Inspection
 License:        GPL-2.0
@@ -39,8 +39,8 @@ BuildRequires:  libnetfilter_conntrack-devel
 BuildRequires:  libnl3-devel
 BuildRequires:  libpcap-devel
 BuildRequires:  libsodium-devel
-BuildRequires:  liburcu-devel
 BuildRequires:  libtool
+BuildRequires:  liburcu-devel
 BuildRequires:  make
 %if 0%{?suse_version} > 1320
 BuildRequires:  ncurses5-devel