diff --git a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java
index 0ed1ad3de..bc5376757 100644
--- a/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java
+++ b/org.eclipse.xtext.util/src/org/eclipse/xtext/util/MergeableManifest.java
@@ -61,7 +61,7 @@ public class MergeableManifest extends Manifest {
     public static String make512Safe(StringBuffer lines) {
         if (lines.length() > 512) {
         	StringBuilder result = new StringBuilder(lines.length());
-        	String[] splitted = lines.toString().split("\\r\\n");
+        	String[] splitted = lines.toString().split("\\r?\\n");
         	for(String string: splitted) {
         		if (string.length() > 512) {
         			int idx = 510;