diff --git a/CHANGES b/CHANGES
index 63483835ba..5c1dc5574e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,18 @@
 
+2.0-beta-47 | 2011-11-16 08:24:33 -0800
+
+  * Catch if logged sets do not contain only atomic types. (Bernhard
+    Amann)
+
+  * Promote libz and libmagic to required dependencies. (Jon Siwek)
+    
+  * Fix parallel make from top-level to work on more platforms. (Jon
+    Siwek)
+
+  * Add decode_base64_custom(). Addresses #670 (Jon Siwek)
+    
+  * A bunch of Sphinx-doc reorgs and polishing. (Jon Siwek)
+    
 2.0-beta-28 | 2011-11-14 20:09:28 -0800
 
   * Binary packaging script tweaks. We now require CMake 2.8.6. (Jon Siwek)
diff --git a/VERSION b/VERSION
index ebffe616f6..deb6c1aac5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.0-beta-28
+2.0-beta-47
diff --git a/src/LogMgr.cc b/src/LogMgr.cc
index f78a2a19e0..ab1706ca72 100644
--- a/src/LogMgr.cc
+++ b/src/LogMgr.cc
@@ -149,7 +149,7 @@ bool LogVal::IsCompatibleType(BroType* t, bool atomic_only)
 		if ( ! t->IsSet() )
 			return false;
 
-		return IsCompatibleType(t->AsSetType()->Indices()->PureType());
+		return IsCompatibleType(t->AsSetType()->Indices()->PureType(), true);
 		}
 
 	case TYPE_VECTOR: