Index: src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java
===================================================================
--- src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java	(révision 1185515)
+++ src/test/java/org/apache/tika/sax/XHTMLContentHandlerTest.java	(copie de travail)
@@ -19,12 +19,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import junit.framework.TestCase;
+
 import org.apache.tika.metadata.Metadata;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
-import junit.framework.TestCase;
-
 /**
  * Unit tests for the {@link XHTMLContentHandler} class.
  */
@@ -113,6 +113,19 @@
         assertEquals("two", words[1]);
     }
 
+    public void testCarriageReturns() throws Exception {
+      xhtml.startDocument();
+      xhtml.startElement("div");
+      xhtml.characters("foo\nbar");
+      xhtml.endElement("div");
+      xhtml.endDocument();
+      String[] words = getRealWords(output.toString());
+
+      assertEquals(2, words.length);
+      assertEquals("foo", words[0]);
+      assertEquals("bar", words[1]);
+    }
+    
     /**
      * Return array of non-zerolength words. Splitting on whitespace will get us
      * empty words for emptylines.
Index: src/main/java/org/apache/tika/sax/XHTMLContentHandler.java
===================================================================
--- src/main/java/org/apache/tika/sax/XHTMLContentHandler.java	(révision 1185515)
+++ src/main/java/org/apache/tika/sax/XHTMLContentHandler.java	(copie de travail)
@@ -265,7 +265,16 @@
     @Override
     public void characters(char[] ch, int start, int length) throws SAXException {
         lazyEndHead(useFrameset);
-        super.characters(ch, start, length);
+        for( int a = start ; a<length ; a++ ) {
+          switch( ch[a] ) {
+            case '\n' :
+              startElement("br");
+              endElement("br");
+              break;
+            default :
+              super.characters(ch, a, 1);
+          }
+        }
     }
 
     //------------------------------------------< public convenience methods >