diff --git a/CHANGES b/CHANGES
index 6315877665..f9b5c69595 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,5 @@
 
-2.5-576 | 2018-05-17 00:54:28 +0000
+2.5-587 | 2018-05-21 18:02:23 +0000
 
   * Switch Bro's communication over to Broker; deprecate the old
     communication system, including Broccoli. See NEWS for more.
diff --git a/VERSION b/VERSION
index 7c9972b026..955e9fb7b1 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.5-585
+2.5-587
diff --git a/src/Scope.cc b/src/Scope.cc
index b0115ca0f6..97d8e23003 100644
--- a/src/Scope.cc
+++ b/src/Scope.cc
@@ -113,7 +113,7 @@ TraversalCode Scope::Traverse(TraversalCallback* cb) const
 
 
 ID* lookup_ID(const char* name, const char* curr_module, bool no_global,
-              bool same_module_only, bool check_export)
+	      bool same_module_only, bool check_export)
 	{
 	string fullname = make_full_var_name(curr_module, name);
 
diff --git a/src/Scope.h b/src/Scope.h
index 10bd84ca1f..f2713fef80 100644
--- a/src/Scope.h
+++ b/src/Scope.h
@@ -64,8 +64,8 @@ extern bool in_debug;
 // If no_global is true, don't search in the default "global" namespace.
 // This passed ownership of a ref'ed ID to the caller.
 extern ID* lookup_ID(const char* name, const char* module,
-                     bool no_global = false, bool same_module_only = false,
-                     bool check_export = true);
+		     bool no_global = false, bool same_module_only = false,
+		     bool check_export = true);
 extern ID* install_ID(const char* name, const char* module_name,
 			bool is_global, bool is_export);
 
diff --git a/src/Stats.cc b/src/Stats.cc
index 960b3085cb..b1d5c427a9 100644
--- a/src/Stats.cc
+++ b/src/Stats.cc
@@ -226,16 +226,16 @@ void ProfileLogger::Log()
 	auto cs = broker_mgr->GetStatistics();
 
 	file->Write(fmt("%0.6f Comm: peers=%zu stores=%zu "
-	                "pending_queries=%zu "
-	                "events_in=%zu events_out=%zu "
-	                "logs_in=%zu logs_out=%zu "
-	                "ids_in=%zu ids_out=%zu ",
-	                network_time, cs.num_peers, cs.num_stores,
-	                cs.num_pending_queries,
-	                cs.num_events_incoming, cs.num_events_outgoing,
-	                cs.num_logs_incoming, cs.num_logs_outgoing,
-	                cs.num_ids_incoming, cs.num_ids_outgoing
-	                ));
+			"pending_queries=%zu "
+			"events_in=%zu events_out=%zu "
+			"logs_in=%zu logs_out=%zu "
+			"ids_in=%zu ids_out=%zu ",
+			network_time, cs.num_peers, cs.num_stores,
+			cs.num_pending_queries,
+			cs.num_events_incoming, cs.num_events_outgoing,
+			cs.num_logs_incoming, cs.num_logs_outgoing,
+			cs.num_ids_incoming, cs.num_ids_outgoing
+		       ));
 
 	// Script-level state.
 	unsigned int size, mem = 0;
diff --git a/src/Stmt.cc b/src/Stmt.cc
index e48b463f5d..26be70c373 100644
--- a/src/Stmt.cc
+++ b/src/Stmt.cc
@@ -915,7 +915,7 @@ std::pair<int, ID*> SwitchStmt::FindCaseLabelMatch(const Val* v) const
 			{
 			reporter->PushLocation(e->GetLocationInfo());
 			reporter->Error("switch expression type mismatch (%s/%s)",
-			    type_name(v->Type()->Tag()), type_name(e->Type()->Tag()));
+					type_name(v->Type()->Tag()), type_name(e->Type()->Tag()));
 			return std::make_pair(-1, nullptr);
 			}