diff --git a/CHANGES b/CHANGES
index 80b5ea4d13..a6b09460cc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,10 @@
 
+2.5-790 | 2018-08-01 11:25:27 -0500
+
+  * Fix --with-binpac configure option (Jon Siwek, Corelight)
+
+  * Update CAF-finding logic (Jon Siwek, Corelight)
+
 2.5-787 | 2018-07-31 16:50:55 -0500
 
   * Add Cisco FabricPath support (Damani Wade, Corelight)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa56ed8b7d..452f2834cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,7 +103,7 @@ if (CAF_FOUND)
 	include_directories(BEFORE ${CAF_INCLUDE_DIRS})
 endif ()
 
-if (NOT BinPAC_ROOT_DIR AND
+if (NOT BINPAC_EXE_PATH AND
     EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/aux/binpac/CMakeLists.txt)
     add_subdirectory(aux/binpac)
 endif ()
diff --git a/VERSION b/VERSION
index 7abdb93759..0a96ff9b53 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-787
+2.5-790
diff --git a/aux/binpac b/aux/binpac
index 5e098fe601..7e6b47ee90 160000
--- a/aux/binpac
+++ b/aux/binpac
@@ -1 +1 @@
-Subproject commit 5e098fe60180ceb38182a5ff530609d9765caef8
+Subproject commit 7e6b47ee90c5b6ab80b0e6f93d5cf835fd86ce4e
diff --git a/configure b/configure
index 56954368ef..46aaeb3bbd 100755
--- a/configure
+++ b/configure
@@ -241,6 +241,7 @@ while [ $# -ne 0 ]; do
             ;;
         --with-binpac=*)
             append_cache_entry BINPAC_EXE_PATH     PATH $optarg
+            append_cache_entry BinPAC_ROOT_DIR     PATH "$(dirname $optarg)/.."
             ;;
         --with-bifcl=*)
             append_cache_entry BIFCL_EXE_PATH      PATH   $optarg