diff --git a/nfs-utils.changes b/nfs-utils.changes
index 3068461..7e327ed 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon Aug  6 07:29:37 UTC 2018 - schwab@suse.de
+
+- sysmacros.patch: include <sys/sysmacros.h> for major
+
+-------------------------------------------------------------------
+Thu Aug  2 01:31:30 UTC 2018 - sflees@suse.de
+
+- use packageand for nfs documentation rather then always
+  installing nfs-doc as part of the documentation pattern.
+
 -------------------------------------------------------------------
 Thu Jul 26 23:05:27 UTC 2018 - nfbrown@suse.com
 
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 5a0f8c1..d636157 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -55,6 +55,7 @@ Patch1:         0001-conffile-ignore-empty-environment-variables.patch
 Patch2:         0002-mount-call-setgroups-before-setuid.patch
 Patch3:         0003-nfs-server-generator-handle-noauto-mounts-correctly.patch
 Patch4:         nsm-headers.patch
+Patch5:         sysmacros.patch
 
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fedfs-utils-devel
@@ -120,6 +121,7 @@ Summary:        Support Utilities for NFS
 Group:          Productivity/Networking/NFS
 Requires:       latex2html-pngicons
 Obsoletes:      nfs-utils < 1.1.0
+Supplements:    (nfs-utils and patterns-base-documentation)
 
 %description -n nfs-doc
 This package contains additional NFS documentation.
@@ -131,6 +133,7 @@ This package contains additional NFS documentation.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 cp %{SOURCE6} .
 
diff --git a/sysmacros.patch b/sysmacros.patch
new file mode 100644
index 0000000..5365a4a
--- /dev/null
+++ b/sysmacros.patch
@@ -0,0 +1,12 @@
+Index: nfs-utils-2.1.1/utils/blkmapd/device-discovery.c
+===================================================================
+--- nfs-utils-2.1.1.orig/utils/blkmapd/device-discovery.c
++++ nfs-utils-2.1.1/utils/blkmapd/device-discovery.c
+@@ -27,6 +27,7 @@
+  */
+ 
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <sys/ioctl.h>
+ #include <sys/mount.h>