diff --git a/sys-apps/pciutils/patches/pciutils-3.6.0.patchset b/sys-apps/pciutils/patches/pciutils-3.6.0.patchset
new file mode 100644
index 000000000..02507303a
--- /dev/null
+++ b/sys-apps/pciutils/patches/pciutils-3.6.0.patchset
@@ -0,0 +1,24 @@
+From 137958092e6ca0b5eb293d9a8f4e7e6cf5a857ad Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Sun, 1 Jul 2018 18:42:31 +0200
+Subject: Build fix
+
+
+diff --git a/lib/sysdep.h b/lib/sysdep.h
+index e525dc4..3d7944d 100644
+--- a/lib/sysdep.h
++++ b/lib/sysdep.h
+@@ -68,6 +68,10 @@ typedef u16 word;
+ #endif
+ #endif
+ 
++#ifdef PCI_OS_HAIKU
++#include <endian.h>
++#endif
++
+ #ifdef PCI_OS_SYLIXOS
+ #include <endian.h>
+ #endif
+-- 
+2.16.4
+
diff --git a/sys-apps/pciutils/pciutils-3.5.6.recipe b/sys-apps/pciutils/pciutils-3.6.0.recipe
similarity index 88%
rename from sys-apps/pciutils/pciutils-3.5.6.recipe
rename to sys-apps/pciutils/pciutils-3.6.0.recipe
index 7a95b01f6..02266fe64 100644
--- a/sys-apps/pciutils/pciutils-3.5.6.recipe
+++ b/sys-apps/pciutils/pciutils-3.6.0.recipe
@@ -11,15 +11,19 @@ the system
 - setpci - allows reading from and writing to PCI device configuration \
 registers. For example, you can adjust the latency timers with it."
 HOMEPAGE="https://mj.ucw.cz/sw/pciutils/"
-COPYRIGHT="1997-2016 Martin Mares"
+COPYRIGHT="1997-2018 Martin Mares"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-$portVersion.tar.gz"
-CHECKSUM_SHA256="0d4d507d395e727384737d3c45cf8c5a0023864a6eb5c6ed7caf7d483995391d"
+CHECKSUM_SHA256="10e9cdeb8d147051dc6aa7f3aa4ae086ba516ce8f81357d6b2d0da9c5923531b"
+PATCHES="pciutils-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 # libpci.so can only be built (for this package) if gcc >= 4.
 if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then
 	LIBPCI_SHARED=yes
@@ -34,7 +38,7 @@ PROVIDES="
 	"
 if [ "$LIBPCI_SHARED" = yes ]; then
 	PROVIDES="$PROVIDES
-		lib:libpci$secondaryArchSuffix = $portVersion compat >= 3
+		lib:libpci$secondaryArchSuffix = $libVersionCompat
 		"
 fi
 
@@ -55,7 +59,7 @@ fi
 
 PROVIDES_devel="
 	pciutils${secondaryArchSuffix}_devel = $portVersion
-	devel:libpci$secondaryArchSuffix = $portVersion compat >= 3
+	devel:libpci$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES_devel="
 	pciutils$secondaryArchSuffix == $portVersion base
@@ -124,7 +128,7 @@ INSTALL()
 	fi
 
 	# $dataDir/pciutils/pci.ids is not in pciutils but in pciutils_data.
-	local data_dir=/packages/pciutils_data${dataDir#/packages/pciutils$secondaryArchSuffix}
+	local data_dir="${dataDir/pciutils$secondaryArchSuffix/pciutils_data}"
 	# So we need to fix the idsdir custom parameter in libpci.pc to make
 	#	pkg-config --variable=idsdir libpci
 	# yeld the correct path to the directory where pci.ids will be.