diff --git a/CHANGES b/CHANGES
index f1ad813d27..02517e4a76 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+8.1.0-dev.617 | 2025-09-30 20:12:14 +0000
+
+  * fixed bug in logic for including/excluding files for script optimization (Vern Paxson, Corelight)
+
 8.1.0-dev.615 | 2025-09-30 19:12:05 +0000
 
   * Remove checks for OpenSSL 1.x versions (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index 3a18a22100..0aeb7f4a21 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-8.1.0-dev.615
+8.1.0-dev.617
diff --git a/src/script_opt/ScriptOpt.cc b/src/script_opt/ScriptOpt.cc
index 16fcfdab52..287c04ec8d 100644
--- a/src/script_opt/ScriptOpt.cc
+++ b/src/script_opt/ScriptOpt.cc
@@ -160,15 +160,18 @@ AnalyzeDecision filename_matches_opt_files(const char* filename) {
 
     auto fin = util::detail::normalize_path(filename);
 
-    for ( auto& s : analysis_options.skip_files )
+    for ( auto& s : sfiles )
         if ( std::regex_match(fin, s) )
             return AnalyzeDecision::SHOULD_NOT;
 
+    if ( ofiles.empty() )
+        return AnalyzeDecision::DEFAULT;
+
     for ( auto& o : ofiles )
         if ( std::regex_match(fin, o) )
             return AnalyzeDecision::SHOULD;
 
-    return AnalyzeDecision::DEFAULT;
+    return AnalyzeDecision::SHOULD_NOT;
 }
 
 AnalyzeDecision obj_matches_opt_files(const Obj* obj) {