diff --git a/CHANGES b/CHANGES
index 156eb23446..1e33825ab8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+2.4-beta-40 | 2015-06-06 08:20:52 -0700
+
+  * PE Analyzer: Change how we calculate the rva_table size. (Vlad Grigorescu)
+
 2.4-beta-39 | 2015-06-05 09:09:44 -0500
 
   * Fix a unit test to check for Broker requirement. (Jon Siwek)
diff --git a/VERSION b/VERSION
index 1ac2d86d7e..1a7a541df8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4-beta-39
+2.4-beta-40
diff --git a/src/file_analysis/analyzer/pe/pe-analyzer.pac b/src/file_analysis/analyzer/pe/pe-analyzer.pac
index ad55d30c55..5454704f94 100644
--- a/src/file_analysis/analyzer/pe/pe-analyzer.pac
+++ b/src/file_analysis/analyzer/pe/pe-analyzer.pac
@@ -5,14 +5,14 @@
 %}
 
 %header{
-VectorVal* process_rvas(const RVAS* rvas, const uint16 size);
+VectorVal* process_rvas(const RVAS* rvas);
 %}
 
 %code{
-VectorVal* process_rvas(const RVAS* rva_table, const uint16 size)
+VectorVal* process_rvas(const RVAS* rva_table)
 	{
 	VectorVal* rvas = new VectorVal(internal_type("index_vec")->AsVectorType());
-	for ( uint16 i=0; i < size; ++i )
+	for ( uint16 i=0; i < rva_table->rvas()->size(); ++i )
 		rvas->Assign(i, new Val((*rva_table->rvas())[i]->size(), TYPE_COUNT));
 
 	return rvas;
@@ -149,7 +149,7 @@ refine flow File += {
 			oh->Assign(21, new Val(${h.subsystem}, TYPE_COUNT));
 			oh->Assign(22, characteristics_to_bro(${h.dll_characteristics}, 16));
 
-			oh->Assign(23, process_rvas(${h.rvas}, ${h.number_of_rva_and_sizes}));
+			oh->Assign(23, process_rvas(${h.rvas}));
 
 			BifEvent::generate_pe_optional_header((analyzer::Analyzer *) connection()->bro_analyzer(),
 			                                      connection()->bro_analyzer()->GetFile()->GetVal()->Ref(),