diff --git a/src/core/log.h b/src/core/log.h
index fd87ace1a..554d16815 100644
--- a/src/core/log.h
+++ b/src/core/log.h
@@ -69,7 +69,7 @@
 #define NS_LOG_COMPONENT_DEFINE(name)                           \
   static ns3::LogComponent g_log = ns3::LogComponent (name)
 
-#define APPEND_TIME_PREFIX                                      \
+#define NS_LOG_APPEND_TIME_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_TIME))                   \
     {                                                           \
       LogTimePrinter printer = LogGetTimePrinter ();            \
@@ -80,13 +80,17 @@
         }                                                       \
     }
 
-#define APPEND_FUNC_PREFIX                                      \
+#define NS_LOG_APPEND_FUNC_PREFIX                               \
   if (g_log.IsEnabled (ns3::LOG_PREFIX_FUNC))                   \
     {                                                           \
       std::clog << g_log.Name () << ":" <<                      \
         __FUNCTION__ << "(): ";                                 \
     }                                                           \
 
+#ifndef NS_LOG_APPEND_CONTEXT
+#define NS_LOG_APPEND_CONTEXT
+#endif /* NS_LOG_APPEND_CONTEXT */
+
 
 /**
  * \ingroup logging
@@ -107,8 +111,9 @@
     {                                                           \
       if (g_log.IsEnabled (level))                              \
         {                                                       \
-          APPEND_TIME_PREFIX;                                   \
-          APPEND_FUNC_PREFIX;                                   \
+          NS_LOG_APPEND_TIME_PREFIX;                            \
+          NS_LOG_APPEND_CONTEXT;                                \
+          NS_LOG_APPEND_FUNC_PREFIX;                            \
           std::clog << msg << std::endl;                        \
         }                                                       \
     }                                                           \
@@ -160,7 +165,8 @@
     {                                                           \
       if (g_log.IsEnabled (ns3::LOG_FUNCTION))                  \
         {                                                       \
-          APPEND_TIME_PREFIX;                                   \
+          NS_LOG_APPEND_TIME_PREFIX;                            \
+          NS_LOG_APPEND_CONTEXT;                                \
           std::clog << g_log.Name () << ":"                     \
                     << __FUNCTION__ << "()" << std::endl;       \
         }                                                       \
@@ -189,7 +195,8 @@
     {                                                   \
       if (g_log.IsEnabled (ns3::LOG_FUNCTION))          \
         {                                               \
-          APPEND_TIME_PREFIX;                           \
+          NS_LOG_APPEND_TIME_PREFIX;                    \
+          NS_LOG_APPEND_CONTEXT;                        \
           std::clog << g_log.Name () << ":"             \
                     << __FUNCTION__ << "(";             \
           ParameterLogger (std::clog)  << parameters;   \