diff --git a/main.cpp b/main.cpp
index cca738e..01a2168 100644
--- a/main.cpp
+++ b/main.cpp
@@ -130,12 +130,9 @@
 
     ATRACE_END();
 
-    // Eventually we'll become the monitoring thread
-    while(1) {
-        pause();
-    }
+    android::IPCThreadState::self()->joinThreadPool();
+    LOG(INFO) << "vold shutting down";
 
-    LOG(ERROR) << "Vold exiting";
     exit(0);
 }