diff --git a/ChangeLog b/ChangeLog
index 98cd188e0..a3e54ec45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* OpenChange/MAPIApplication.m (-shouldSetupSignalHandlers):
+	overriden method by returning "NO".
+
 2012-08-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAptMailNotification.m (-setupValues):
diff --git a/OpenChange/MAPIApplication.m b/OpenChange/MAPIApplication.m
index ecf3bedb0..b4ad58073 100644
--- a/OpenChange/MAPIApplication.m
+++ b/OpenChange/MAPIApplication.m
@@ -66,6 +66,11 @@ MAPIApplication *MAPIApp = nil;
   return MAPIApp;
 }
 
+- (BOOL) shouldSetupSignalHandlers
+{
+  return NO;
+}
+
 - (void) setUserContext: (MAPIStoreUserContext *) newContext
 {
   /* user contexts must not be retained here ad their holder (mapistore)