diff --git a/CHANGES b/CHANGES
index dc2b1ba9f9..fd7aae48be 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
 
+2.5-beta-12 | 2016-09-06 07:35:38 -0700
+
+  * Added a missing fclose in scan.l. Addresses BIT-1690.
+    (Daniel Thayer).
+
+  * Fix issue with file_extraction_limit event. (Seth Hall)
+
+  * Fix a crash when a user disables DCE_RPC while enabling SMB.
+    (Seth Hall)
+
 2.5-beta-6 | 2016-08-19 07:50:10 -0700
 
   * Clarify explanation of mime_entity_data event. (Moshe Kaplan)
diff --git a/VERSION b/VERSION
index b7e0535a21..9901bc2c99 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-beta-6
+2.5-beta-12
diff --git a/src/scan.l b/src/scan.l
index a6e37a67f7..4fd2aac1c3 100644
--- a/src/scan.l
+++ b/src/scan.l
@@ -90,7 +90,10 @@ static ino_t get_inode_num(const string& path)
 	if ( ! f )
 		reporter->FatalError("failed to open %s\n", path.c_str());
 
-	return get_inode_num(f, path);
+	ino_t inum = get_inode_num(f, path);
+	fclose(f);
+
+	return inum;
 	}
 
 class FileInfo {
@@ -599,7 +602,12 @@ static int load_files(const char* orig_file)
 	ino_t i = get_inode_num(f, file_path);
 
 	if ( already_scanned(i) )
+		{
+		if ( f != stdin )
+			fclose(f);
+
 		return 0;
+		}
 
 	ScannedFile sf(i, file_stack.length(), file_path);
 	files_scanned.push_back(sf);