diff --git a/src/mumta/evloop.cpp b/src/mumta/evloop.cpp
index 3b558256a8b58cae7c20285414d1856dc1357c0c..896e6105ee3432eeca7a62ba9b229b1d91a15ea2 100644
--- a/src/mumta/evloop.cpp
+++ b/src/mumta/evloop.cpp
@@ -31,7 +31,24 @@ struct stdin_waiter : std::enable_shared_from_this<stdin_waiter>
 void rmrf::ev::loop() {
     ::ev::default_loop defloop;
 
-    auto w = std::make_shared<stdin_waiter>();
+    //auto w = std::make_shared<stdin_waiter>();
 
     defloop.run(0);
 }
+
+void stop_default_loop_cb(EV_P_ ev_async* event, int) {
+    ::ev::loop_ref defloop = ::ev::get_default_loop();
+
+    ev_async_stop(defloop, event);
+
+    defloop.break_loop();
+}
+
+void rmrf::ev::stop() {
+    ::ev::loop_ref defloop = ::ev::get_default_loop();
+    // We need to use the C API directly as ev++ does not yet support asynchrounous events
+    ev_async stop_event;
+    ev_async_init(&stop_event, stop_default_loop_cb);
+    ev_async_start(defloop, &stop_event);
+    ev_async_send(defloop, &stop_event);
+}
diff --git a/src/mumta/evloop.hpp b/src/mumta/evloop.hpp
index 7aac30e711e5e80f935ee7ef8afac3f5a68ceb8a..d55b93419b1a81e943dd6c78af8aa5cf8fddfb0a 100644
--- a/src/mumta/evloop.hpp
+++ b/src/mumta/evloop.hpp
@@ -12,5 +12,6 @@ bool init_libev();
 bool init_watchdog();
 
 void loop();
+void stop();
 
 }