diff --git a/APMrover2/GCS_Mavlink.cpp b/APMrover2/GCS_Mavlink.cpp
index b8420c46f7..95e93b377e 100644
--- a/APMrover2/GCS_Mavlink.cpp
+++ b/APMrover2/GCS_Mavlink.cpp
@@ -1434,7 +1434,7 @@ void Rover::gcs_send_text(MAV_SEVERITY severity, const prog_char_t *str)
     }
     }
 #if LOGGING_ENABLED == ENABLED
-    DataFlash.Log_Write_Message_P(str);
+    DataFlash.Log_Write_Message(str);
 #endif
 }
 
diff --git a/AntennaTracker/GCS_Mavlink.cpp b/AntennaTracker/GCS_Mavlink.cpp
index db8106a5aa..2acd819cac 100644
--- a/AntennaTracker/GCS_Mavlink.cpp
+++ b/AntennaTracker/GCS_Mavlink.cpp
@@ -968,7 +968,7 @@ void Tracker::gcs_send_text(MAV_SEVERITY severity, const prog_char_t *str)
         }
     }
 #if LOGGING_ENABLED == ENABLED
-    DataFlash.Log_Write_Message_P(str);
+    DataFlash.Log_Write_Message(str);
 #endif
 }
 
diff --git a/ArduCopter/Log.cpp b/ArduCopter/Log.cpp
index c2f61c3ca4..b2a26414a8 100644
--- a/ArduCopter/Log.cpp
+++ b/ArduCopter/Log.cpp
@@ -783,7 +783,7 @@ void Copter::Log_Read(uint16_t list_entry, uint16_t start_page, uint16_t end_pag
 void Copter::Log_Write_Vehicle_Startup_Messages()
 {
     // only 200(?) bytes are guaranteed by DataFlash
-    DataFlash.Log_Write_Message_P("Frame: " FRAME_CONFIG_STRING);
+    DataFlash.Log_Write_Message("Frame: " FRAME_CONFIG_STRING);
     DataFlash.Log_Write_Mode(control_mode);
 }
 
diff --git a/ArduPlane/GCS_Mavlink.cpp b/ArduPlane/GCS_Mavlink.cpp
index 435df1fedc..1c6df7a55d 100644
--- a/ArduPlane/GCS_Mavlink.cpp
+++ b/ArduPlane/GCS_Mavlink.cpp
@@ -2000,7 +2000,7 @@ void Plane::gcs_send_text(MAV_SEVERITY severity, const prog_char_t *str)
         }
     }
 #if LOGGING_ENABLED == ENABLED
-    DataFlash.Log_Write_Message_P(str);
+    DataFlash.Log_Write_Message(str);
 #endif
 }
 
diff --git a/libraries/DataFlash/DFMessageWriter.cpp b/libraries/DataFlash/DFMessageWriter.cpp
index a5a2d8a7cc..3b37ae0a9f 100644
--- a/libraries/DataFlash/DFMessageWriter.cpp
+++ b/libraries/DataFlash/DFMessageWriter.cpp
@@ -116,7 +116,7 @@ void DFMessageWriter_WriteSysInfo::process() {
         // fall through
 
     case ws_blockwriter_stage_firmware_string:
-        if (! _DataFlash.Log_Write_Message_P(_firmware_string)) {
+        if (! _DataFlash.Log_Write_Message(_firmware_string)) {
             return; // call me again
         }
         stage = ws_blockwriter_stage_git_versions;
@@ -124,7 +124,7 @@ void DFMessageWriter_WriteSysInfo::process() {
 
     case ws_blockwriter_stage_git_versions:
 #if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION)
-        if (! _DataFlash.Log_Write_Message_P("PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION)) {
+        if (! _DataFlash.Log_Write_Message("PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION)) {
             return; // call me again
         }
 #endif
@@ -163,7 +163,7 @@ void DFMessageWriter_WriteEntireMission::process() {
         // fall through
 
     case em_blockwriter_stage_write_new_mission_message:
-        if (! _DataFlash.Log_Write_Message_P("New mission")) {
+        if (! _DataFlash.Log_Write_Message("New mission")) {
             return; // call me again
         }
         stage = em_blockwriter_stage_write_mission_items;
diff --git a/libraries/DataFlash/LogFile.cpp b/libraries/DataFlash/LogFile.cpp
index 965a833a4c..ff35f5f386 100644
--- a/libraries/DataFlash/LogFile.cpp
+++ b/libraries/DataFlash/LogFile.cpp
@@ -1016,10 +1016,10 @@ void DataFlash_Class::Log_Write_Vibration(const AP_InertialSensor &ins)
 
 void DataFlash_Class::Log_Write_SysInfo(const prog_char_t *firmware_string)
 {
-    Log_Write_Message_P(firmware_string);
+    Log_Write_Message(firmware_string);
 
 #if defined(PX4_GIT_VERSION) && defined(NUTTX_GIT_VERSION)
-    Log_Write_Message_P("PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION);
+    Log_Write_Message("PX4: " PX4_GIT_VERSION " NuttX: " NUTTX_GIT_VERSION);
 #endif
 
     // write system identifier as well if available