diff --git a/src/tools/clangbackend/source/cursor.cpp b/src/tools/clangbackend/source/cursor.cpp
index 00fde42cc82..e8092186be6 100644
--- a/src/tools/clangbackend/source/cursor.cpp
+++ b/src/tools/clangbackend/source/cursor.cpp
@@ -246,9 +246,11 @@ ClangString Cursor::briefComment() const
     return ClangString(clang_Cursor_getBriefCommentText(m_cxCursor));
 }
 
-ClangString Cursor::rawComment() const
+Utf8String Cursor::rawComment() const
 {
-    return ClangString(clang_Cursor_getRawCommentText(m_cxCursor));
+    Utf8String comment = ClangString(clang_Cursor_getRawCommentText(m_cxCursor));
+    comment.replace(Utf8String("\r\n"), Utf8String("\n"));
+    return comment;
 }
 
 int Cursor::argumentCount() const
diff --git a/src/tools/clangbackend/source/cursor.h b/src/tools/clangbackend/source/cursor.h
index 6541e633e65..c748db47252 100644
--- a/src/tools/clangbackend/source/cursor.h
+++ b/src/tools/clangbackend/source/cursor.h
@@ -79,7 +79,7 @@ public:
     ClangString mangling() const;
     ClangString spelling() const;
     ClangString briefComment() const;
-    ClangString rawComment() const;
+    Utf8String rawComment() const;
     int argumentCount() const;
 
     Type type() const;