diff --git a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
index 26d1ddd..1c66e33 100644
--- a/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
+++ b/framework/src/main/java/org/apache/felix/framework/util/manifestparser/ManifestParser.java
@@ -1537,7 +1537,6 @@
     public static void main(String[] headers)
     {
         String header = headers[0];
-        
         if (header != null)
         {
             if (header.length() == 0)
@@ -1662,10 +1661,25 @@
                     {
                         quoted = false;
                     }
-                    state = VALUE;
+                    if (!Character.isWhitespace(currentChar)) {
+                    	state = VALUE;
+                    }
+                    else {
+                    	currentPosition++;
+                    }
                     break;
                 case VALUE:
-                    escaped = currentChar == '\\';
+                    if (currentChar == '\\' ) 
+                    {
+                        if (escaped) 
+                        {
+                            escaped = false;
+                        }
+                        else 
+                        {
+                            escaped = true;
+                        }
+                    }
                     if (quoted && !escaped && currentChar == '\"') 
                     {
                         quoted = false;