diff --git a/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java b/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
index 4ecc890b..b03b1538 100644
--- a/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
+++ b/javadoc/src/main/java/org/apache/cxf/xjc/javadoc/PropertyJavadoc.java
@@ -63,7 +63,7 @@ public void addJavadocs() {
         if (documentation == null || "".equals(documentation.trim())) {
             return;
         }
-        setJavadoc(documentation.trim());
+        setJavadoc(documentation.replaceAll("^\\s+|\\s+$|\\s*(\n)\\s*|(\\s)\\s*", "$1$2"));
     }
 
     private XSComponent getDocumentedComponent(CPropertyInfo propertyInfo) {
diff --git a/javadoc/src/test/resources/complexTypeWithDocumentedAttribute.xsd b/javadoc/src/test/resources/complexTypeWithDocumentedAttribute.xsd
index 23cff9b1..c97377f1 100644
--- a/javadoc/src/test/resources/complexTypeWithDocumentedAttribute.xsd
+++ b/javadoc/src/test/resources/complexTypeWithDocumentedAttribute.xsd
@@ -28,5 +28,13 @@
 				<documentation>Documentation of attribute</documentation>
 			</annotation>
 		</attribute>
+		<attribute name="multilineDocumentedAttribute" type="string">
+			<annotation>
+				<documentation>
+                    Multiline documentation of
+                    attribute
+				</documentation>
+			</annotation>
+		</attribute>
 	</complexType>
 </schema>
\ No newline at end of file
diff --git a/javadoc/src/test/resources/complexTypeWithDocumentedProperties.xsd b/javadoc/src/test/resources/complexTypeWithDocumentedProperties.xsd
index 47829b76..f6c4f535 100644
--- a/javadoc/src/test/resources/complexTypeWithDocumentedProperties.xsd
+++ b/javadoc/src/test/resources/complexTypeWithDocumentedProperties.xsd
@@ -31,6 +31,14 @@
     		<element name="elementWithoutDocumentation" type="string">
     			<annotation></annotation>
     		</element>
+			<element name="multilineDocumentedElement" type="string">
+				<annotation>
+					<documentation>
+						Some multiline documentation of
+						element
+					</documentation>
+				</annotation>
+			</element>
     	</sequence>
     </complexType>
 </schema>
\ No newline at end of file