diff --git a/cmake_targets/CMakeLists.txt b/cmake_targets/CMakeLists.txt
index 669387488d31c927dcd733a5dc03132e6b083bbd..2e687180d67294b2ba0ec73a5f6bd9563ff353d8 100644
--- a/cmake_targets/CMakeLists.txt
+++ b/cmake_targets/CMakeLists.txt
@@ -174,6 +174,7 @@ add_boolean_option(PDCP_MSG_PRINT False "print PDCP messages")
 add_boolean_option(TEST_OMG False "???")
 add_boolean_option(DEBUG_OMG False "???")
 add_boolean_option(XFORMS False "This adds the possibility to see the signal oscilloscope")
+add_boolean_option(DEBUG_CONSOLE False "makes debugging easier, disables stdout/stderr buffering")
 
 add_boolean_option(ENABLE_ITTI True "ITTI is internal messaging, should remain enabled for most targets")
 set (ITTI_DIR ${OPENAIR_DIR}/common/utils/itti)
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 7723d32e1bae12f1b3926c26de3bc608cde426a6..92d2de5c048d657a95c7cdd41bc6b60f077cce9a 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -2239,6 +2239,11 @@ int main( int argc, char **argv )
   int error_code;
 #endif
 
+#ifdef DEBUG_CONSOLE
+  setvbuf(stdout, NULL, _IONBF, 0);
+  setvbuf(stderr, NULL, _IONBF, 0);
+#endif
+
   PHY_VARS_UE *UE[MAX_NUM_CCs];
 
   mode = normal_txrx;