diff --git a/components/esp8266/Kconfig b/components/esp8266/Kconfig
index 43fe2ded..ffe189d9 100644
--- a/components/esp8266/Kconfig
+++ b/components/esp8266/Kconfig
@@ -4,6 +4,30 @@ config APP_OFFSET
        hex
        default 0x1000
 
+choice NEWLIB_STDOUT_LINE_ENDING
+    prompt "Line ending for UART output"
+    default NEWLIB_STDOUT_LINE_ENDING_CRLF
+    help
+        This option allows configuring the desired line endings sent to UART
+        when a newline ('\n', LF) appears on stdout.
+        Three options are possible:
+
+        CRLF: whenever LF is encountered, prepend it with CR
+
+        LF: no modification is applied, stdout is sent as is
+
+        CR: each occurence of LF is replaced with CR
+
+        This option doesn't affect behavior of the UART driver (drivers/uart.h).
+
+config NEWLIB_STDOUT_LINE_ENDING_CRLF
+    bool "CRLF"
+config NEWLIB_STDOUT_LINE_ENDING_LF
+    bool "LF"
+config NEWLIB_STDOUT_LINE_ENDING_CR
+    bool "CR"
+endchoice
+
 endmenu
 
 menu PHY
diff --git a/components/newlib/newlib/port/syscall.c b/components/newlib/newlib/port/syscall.c
index 343ae6e7..870652e1 100644
--- a/components/newlib/newlib/port/syscall.c
+++ b/components/newlib/newlib/port/syscall.c
@@ -12,30 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "sdkconfig.h"
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/stat.h>
 
-#include "rom/ets_sys.h"
-#include "esp8266/eagle_soc.h"
-#include "esp8266/uart_register.h"
+#include "esp_libc.h"
 #include "FreeRTOS.h"
 #include "esp_log.h"
 
-#define PANIC_UART 0
-
-static inline void panit_putc(char c)
-{
-    while (1) {
-        uint32_t fifo_cnt = READ_PERI_REG(UART_STATUS(PANIC_UART)) & (UART_TXFIFO_CNT << UART_TXFIFO_CNT_S);
-
-        if ((fifo_cnt >> UART_TXFIFO_CNT_S & UART_TXFIFO_CNT) < 126)
-            break;
-    }
-
-    WRITE_PERI_REG(UART_FIFO(PANIC_UART) , c);
-}
-
 int _open_r(struct _reent *r, const char *filename, int flags, int mode)
 {
     return 0;
@@ -51,8 +37,22 @@ _ssize_t _write_r(struct _reent *r, int fd, void *buf, size_t len)
     int i;
     const char *cbuf = buf;
 
-    for (i = 0; i < len; i++)
-        panit_putc(cbuf[i]);
+    for (i = 0; i < len; i++) {
+#ifdef CONFIG_NEWLIB_STDOUT_LINE_ENDING_CRLF
+        if (cbuf[i] == '\n') {
+            ets_putc('\r');
+            ets_putc('\n');
+        } else
+            ets_putc(cbuf[i]);
+#elif defined(CONFIG_NEWLIB_STDOUT_LINE_ENDING_CR)
+        if (cbuf[i] == '\n')
+            ets_putc('\r');
+        else
+            ets_putc(cbuf[i]);
+#elif defined(CONFIG_NEWLIB_STDOUT_LINE_ENDING_LF)
+        ets_putc(cbuf[i]);
+#endif
+    }
 
     return len;
 }