diff --git a/integration/HTMLValue.php b/integration/HTMLValue.php
index ee38a6535..312ba2807 100755
--- a/integration/HTMLValue.php
+++ b/integration/HTMLValue.php
@@ -45,6 +45,11 @@ class SS_HTMLValue extends ViewableData {
 	 * @return bool
 	 */
 	public function setContent($content) {
+		// Ensure that window-style newlines don't get replaced with "&#13;" entity by DOMDocument
+		if (PHP_EOL == "\n") { 
+			$content = str_replace("\r\n", PHP_EOL, $content); 
+		}
+		
 		return @$this->getDocument()->loadHTML(
 			'<html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head>' .
 			"<body>$content</body></html>"
diff --git a/tests/integration/HTMLValueTest.php b/tests/integration/HTMLValueTest.php
index 4a69b78bc..0c984a8b3 100755
--- a/tests/integration/HTMLValueTest.php
+++ b/tests/integration/HTMLValueTest.php
@@ -38,4 +38,15 @@ class SS_HTMLValueTest extends SapphireTest {
 		}
 	}
 	
+	public function testMixedNewlines() {
+		$value = new SS_HTMLValue();
+		$eol = PHP_EOL;
+		$value->setContent("<p>paragraph</p>{$eol}<ul><li>1</li>\r\n</ul>");
+		$this->assertEquals(
+			"<p>paragraph</p>{$eol}<ul><li>1</li>{$eol}</ul>", 
+			$value->getContent(),
+			'Newlines get converted'
+		);
+	}
+	
 }
\ No newline at end of file
