diff --git a/libsepol-fedora.patch b/libsepol-fedora.patch
index 3e934b6..4180158 100644
--- a/libsepol-fedora.patch
+++ b/libsepol-fedora.patch
@@ -19,10 +19,12 @@ index a43b343..6d89f17 100644
  	$(LOCAL_PATH)/include/ \
  	$(LOCAL_PATH)/src/ \
 diff --git libsepol-2.5/ChangeLog libsepol-2.5/ChangeLog
-index ace3d54..edbeacf 100644
+index ace3d54..4c997c5 100644
 --- libsepol-2.5/ChangeLog
 +++ libsepol-2.5/ChangeLog
-@@ -1,3 +1,19 @@
+@@ -1,3 +1,21 @@
++	* Add missing return to sepol_node_query(), from Petr Lautrbach.
++	* Add missing <stdarg.h> include, from Thomas Petazzoni.
 +	* Correctly detect unknown classes in sepol_string_to_security_class, from Joshua Brindle.
 +	* Sort object files for deterministic linking order, from Laurent Bigonville.
 +	* Fix neverallowxperm checking on attributes, from Jeff Vander Stoep.
@@ -1650,6 +1652,18 @@ index 8e4c207..e28c33e 100644
  	return SEPOL_OK;
  }
 -
+diff --git libsepol-2.5/cil/src/cil_log.h libsepol-2.5/cil/src/cil_log.h
+index 4112aaf..541569b 100644
+--- libsepol-2.5/cil/src/cil_log.h
++++ libsepol-2.5/cil/src/cil_log.h
+@@ -30,6 +30,7 @@
+ #define CIL_LOG_H_
+ 
+ #include <stdlib.h>
++#include <stdarg.h>
+ #include <cil/cil.h>
+ 
+ #define MAX_LOG_SIZE 512
 diff --git libsepol-2.5/cil/src/cil_parser.c libsepol-2.5/cil/src/cil_parser.c
 index d0e108c..101520c 100644
 --- libsepol-2.5/cil/src/cil_parser.c
@@ -3155,6 +3169,18 @@ index bd48ba0..21043b6 100644
  			memcpy(&addr.s6_addr[0], addr_bytes, 16);
  #else
  			memcpy(&addr.s6_addr32[0], addr_bytes, 16);
+diff --git libsepol-2.5/src/nodes.c libsepol-2.5/src/nodes.c
+index 50cf21d..820346d 100644
+--- libsepol-2.5/src/nodes.c
++++ libsepol-2.5/src/nodes.c
+@@ -273,6 +273,7 @@ int sepol_node_query(sepol_handle_t * handle,
+ 							   c, SEPOL_PROTO_IP6,
+ 							   response) < 0)
+ 						goto err;
++					return STATUS_SUCCESS;
+ 				}
+ 			}
+ 			break;
 diff --git libsepol-2.5/src/port_record.c libsepol-2.5/src/port_record.c
 index 6a33d93..ed9093b 100644
 --- libsepol-2.5/src/port_record.c
diff --git a/libsepol.spec b/libsepol.spec
index deda9ba..e618627 100644
--- a/libsepol.spec
+++ b/libsepol.spec
@@ -1,14 +1,14 @@
 Summary: SELinux binary policy manipulation library 
 Name: libsepol
 Version: 2.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libsepol-2.5.tar.gz
 # download https://raw.githubusercontent.com/fedora-selinux/scripts/master/selinux/make-fedora-selinux-patch.sh
 # run:
 # $ VERSION=2.5 ./make-fedora-selinux-patch.sh libsepol
-# HEAD https://github.com/fedora-selinux/selinux/commit/9abe77e2a670f2f2dfb91f9cec46ee37f9c23995
+# HEAD https://github.com/fedora-selinux/selinux/commit/9eb71873eb6e6073228257abbeb42f61b2719336
 Patch1: libsepol-fedora.patch
 URL: https://github.com/SELinuxProject/selinux/wiki
 BuildRequires: flex
@@ -106,6 +106,10 @@ exit 0
 %{_libdir}/libsepol.so.1
 
 %changelog
+* Thu Jul 14 2016 Petr Lautrbach <plautrba@redhat.com> - 2.5-8
+- Add missing return to sepol_node_query()
+- Add missing <stdarg.h> include
+
 * Thu Jun 23 2016 Petr Lautrbach <plautrba@redhat.com> - 2.5-7
 - Correctly detect unknown classes in sepol_string_to_security_class
 - Sort object files for deterministic linking order