diff --git a/nbd-3.16.2.tar.xz b/nbd-3.16.2.tar.xz
deleted file mode 100644
index da9be8f..0000000
--- a/nbd-3.16.2.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:422f62bdf6e6b973bd82083dc52b6577396fe00aa6607837ac464e476124155b
-size 504880
diff --git a/nbd-3.17.tar.xz b/nbd-3.17.tar.xz
new file mode 100644
index 0000000..6456241
--- /dev/null
+++ b/nbd-3.17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d95c6bb1a3ab33b953af99b73fb4833e123bd25433513b32d57dbeb1a0a0d189
+size 511224
diff --git a/nbd.changes b/nbd.changes
index bce442a..4c93f34 100644
--- a/nbd.changes
+++ b/nbd.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul  9 14:47:47 UTC 2018 - mpluskal@suse.com
+
+- Update to version 1.17.0:
+  * proto: add xNBD command NBD_CMD_CACHE to the spec
+  * server: do not crash when handling child name
+  * server: Close socket pair when fork fails
+
 -------------------------------------------------------------------
 Fri Jan  5 13:15:24 UTC 2018 - mpluskal@suse.com
 
diff --git a/nbd.spec b/nbd.spec
index 1e16f1f..89c15eb 100644
--- a/nbd.spec
+++ b/nbd.spec
@@ -16,15 +16,11 @@
 #
 
 
-#Compat macro for new _fillupdir macro introduced in Nov 2017
-%if ! %{defined _fillupdir}
-  %define _fillupdir %{_localstatedir}/adm/fillup-templates
-%endif
 Name:           nbd
-Version:        3.16.2
+Version:        3.17
 Release:        0
 Summary:        Network Block Device Server and Client Utilities
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Other
 URL:            http://nbd.sourceforge.net/
 Source0:        https://sourceforge.net/projects/nbd/files/nbd/%{version}/nbd-%{version}.tar.xz
@@ -76,8 +72,8 @@ install -D -p -m 0644  %{SOURCE1} \
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-server
 
 # autoload nbd module
-install -d -m 755 %{buildroot}%{_prefix}/lib/modules-load.d/
-echo "nbd" > %{buildroot}%{_prefix}/lib/modules-load.d/%{name}.conf
+install -d -m 755 %{buildroot}%{_libexecdir}/modules-load.d/
+echo "nbd" > %{buildroot}%{_libexecdir}/modules-load.d/%{name}.conf
 
 #echo "#Port	file	options" > $RPM_BUILD_ROOT/etc/nbd-server.conf
 mkdir -p %{buildroot}%{_sysconfdir}/nbd-server
@@ -128,18 +124,18 @@ fi
 %{_sbindir}/rcnbd-server
 %{_unitdir}/%{name}@.service
 %{_unitdir}/%{name}-server.service
-%{_mandir}/man1/nbd-server.1%{ext_man}
-%{_mandir}/man1/nbd-trdump.1%{ext_man}
-%{_mandir}/man5/nbd-server.5%{ext_man}
-%{_mandir}/man8/nbd-client.8%{ext_man}
-%{_mandir}/man5/nbdtab.5%{ext_man}
+%{_mandir}/man1/nbd-server.1%{?ext_man}
+%{_mandir}/man1/nbd-trdump.1%{?ext_man}
+%{_mandir}/man5/nbd-server.5%{?ext_man}
+%{_mandir}/man8/nbd-client.8%{?ext_man}
+%{_mandir}/man5/nbdtab.5%{?ext_man}
 %doc README.md
 %dir %{_sysconfdir}/nbd-server
 %ghost %config(noreplace) %{_sysconfdir}/nbd-server/config
 %ghost %config(noreplace) %{_sysconfdir}/nbd-server/allow
 %config %{_sysconfdir}/nbd-server/config.example
-%dir %{_prefix}/lib/modules-load.d/
-%{_prefix}/lib/modules-load.d/nbd.conf
+%dir %{_libexecdir}/modules-load.d/
+%{_libexecdir}/modules-load.d/nbd.conf
 %{_fillupdir}/sysconfig.%{name}-server
 
 %changelog