diff --git a/src/logging/Manager.cc b/src/logging/Manager.cc
index 7f785e1080..a4dea1c909 100644
--- a/src/logging/Manager.cc
+++ b/src/logging/Manager.cc
@@ -7,6 +7,7 @@
 #include "../NetVar.h"
 #include "../Net.h"
 
+#include "threading/Manager.h"
 #include "threading/SerialTypes.h"
 
 #include "Manager.h"
@@ -124,6 +125,7 @@ Manager::Stream::~Stream()
 
 Manager::Manager()
 	{
+	rotations_pending = 0;
 	}
 
 Manager::~Manager()
@@ -1127,6 +1129,13 @@ bool Manager::Flush(EnumVal* id)
 
 void Manager::Terminate()
 	{
+	// Make sure we process all the pending rotations.
+	while ( rotations_pending )
+		{
+		thread_mgr->ForceProcessing(); // A blatant layering violation ...
+		usleep(1000);
+		}
+
 	for ( vector<Stream *>::iterator s = streams.begin(); s != streams.end(); ++s )
 		{
 		if ( ! *s )
@@ -1235,6 +1244,8 @@ void Manager::Rotate(WriterInfo* winfo)
 
 	// Trigger the rotation.
 	winfo->writer->Rotate(tmp, winfo->open_time, network_time, terminating);
+
+	++rotations_pending;
 	}
 
 bool Manager::FinishedRotation(WriterFrontend* writer, string new_name, string old_name,
@@ -1243,6 +1254,8 @@ bool Manager::FinishedRotation(WriterFrontend* writer, string new_name, string o
 	DBG_LOG(DBG_LOGGING, "Finished rotating %s at %.6f, new name %s",
 		writer->Path().c_str(), network_time, new_name.c_str());
 
+	--rotations_pending;
+
 	WriterInfo* winfo = FindWriter(writer);
 	if ( ! winfo )
 		return true;
diff --git a/src/logging/Manager.h b/src/logging/Manager.h
index 5af3e55b4a..f5e62b0683 100644
--- a/src/logging/Manager.h
+++ b/src/logging/Manager.h
@@ -200,6 +200,7 @@ private:
 	WriterInfo* FindWriter(WriterFrontend* writer);
 
 	vector<Stream *> streams;	// Indexed by stream enum.
+	int rotations_pending;	// Number of rotations not yet finished.
 };
 
 }
diff --git a/src/threading/Manager.h b/src/threading/Manager.h
index 7d9ba766d4..ab8189f39d 100644
--- a/src/threading/Manager.h
+++ b/src/threading/Manager.h
@@ -77,6 +77,12 @@ public:
 	 */
 	int NumThreads() const { return all_threads.size(); }
 
+	/** Manually triggers processing of any thread input. This can be useful
+	 *  if the main thread is waiting for a specific message from a child.
+	 *  Usually, though, one should avoid using it.
+	 */
+	void ForceProcessing() { Process(); }
+
 protected:
 	friend class BasicThread;
 	friend class MsgThread;