diff --git a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
index 710a3c2388c68c47c747e0c9ac8af0dad52629a9..ae97150caa940028f8d416d5bd1f6f975e1d0ec8 100644
--- a/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioZrtpSession.cpp
@@ -118,7 +118,7 @@ void AudioZrtpSession::initializeZid (void)
     _debug ("Initialization from ZID file failed. Trying to remove...");
 
     if (remove (zidCompleteFilename.c_str()) !=0) {
-        _debug ("Failed to remove zid file because of: %s", strerror (errno));
+        _debug ("Failed to remove zid file: %m");
         throw ZrtpZidException("zid file deletion failed");
     }
 
diff --git a/sflphone-common/src/config/config.cpp b/sflphone-common/src/config/config.cpp
index 5a70ef60c330e2bc4d153f030c1df296a7e377d3..eed2b10b7fd35932c74005a188e4efde672b520a 100644
--- a/sflphone-common/src/config/config.cpp
+++ b/sflphone-common/src/config/config.cpp
@@ -308,7 +308,7 @@ ConfigTree::saveConfigTree (const std::string& fileName)
     file.close();
 
     if (chmod (fileName.c_str(), S_IRUSR | S_IWUSR)) {
-        _error ("ConfigTree: Error: Failed to set permission on configuration: %s",strerror (errno));
+        _error ("ConfigTree: Error: Failed to set permission on configuration: %m");
     }
 
     return true;
@@ -398,7 +398,7 @@ ConfigTree::populateFromFile (const std::string& fileName)
     file.close();
 
     if (chmod (fileName.c_str(), S_IRUSR | S_IWUSR)) {
-        _debug ("Failed to set permission on configuration file because: %s",strerror (errno));
+        _debug ("Failed to set permission on configuration file because: %m");
     }
 
     return 1;
diff --git a/sflphone-common/src/history/historymanager.cpp b/sflphone-common/src/history/historymanager.cpp
index cb0498ec2ee295834ad3f38add00b5f49d52d9b9..afb87b55594ef646f56f32f98fc44a7c20f6e4f9 100644
--- a/sflphone-common/src/history/historymanager.cpp
+++ b/sflphone-common/src/history/historymanager.cpp
@@ -200,7 +200,7 @@ int HistoryManager::create_history_path (std::string path)
         if (mkdir (userdata.data(), 0755) != 0) {
             // If directory	creation failed
             if (errno != EEXIST) {
-                _debug ("HistoryManager: Cannot create directory: %s", strerror (errno));
+                _debug ("HistoryManager: Cannot create directory: %m");
                 return -1;
             }
         }
diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp
index 8b1d98ce70b36fbf19a33c4458370b2baf0e001a..63d8e485861327400be480825e46e3707745340f 100644
--- a/sflphone-common/src/managerimpl.cpp
+++ b/sflphone-common/src/managerimpl.cpp
@@ -2534,7 +2534,7 @@ int ManagerImpl::createSettingsPath (void)
     if (mkdir (_path.data(), 0700) != 0) {
         // If directory	creation failed
         if (errno != EEXIST) {
-            _debug ("Cannot create directory: %s", strerror (errno));
+            _debug ("Cannot create directory: %m");
             return -1;
         }
     }