diff --git a/src/fpm_filesystem.F90 b/src/fpm_filesystem.F90
index 9a278e8c76..0b6c246498 100644
--- a/src/fpm_filesystem.F90
+++ b/src/fpm_filesystem.F90
@@ -2,7 +2,7 @@
 !!
 module fpm_filesystem
     use,intrinsic :: iso_fortran_env, only : stdin=>input_unit, stdout=>output_unit, stderr=>error_unit
-    use,intrinsic :: iso_c_binding, only: c_new_line
+    use,intrinsic :: iso_c_binding, only: c_new_line, c_carriage_return
     use fpm_environment, only: get_os_type, &
                                OS_UNKNOWN, OS_LINUX, OS_MACOS, OS_WINDOWS, &
                                OS_CYGWIN, OS_SOLARIS, OS_FREEBSD, OS_OPENBSD
@@ -324,6 +324,8 @@ function read_lines_expanded(fh) result(lines)
         if (content(i:i) == c_new_line) then
             count = count + 1
             idx(count + 1) = i + 1
+            content(i:i) = " "
+            if (content(i-1:i-1) == c_carriage_return) content(i-1:i-1) = " "
         end if
     end do
 
@@ -355,6 +357,8 @@ function read_lines(fh) result(lines)
         if (content(i:i) == c_new_line) then
             count = count + 1
             idx(count + 1) = i + 1
+            content(i:i) = " "
+            if (content(i-1:i-1) == c_carriage_return) content(i-1:i-1) = " "
         end if
     end do