Index: src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java
===================================================================
--- src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java	(revision 787160)
+++ src/scratchpad/src/org/apache/poi/hwpf/HWPFDocument.java	(working copy)
@@ -345,6 +345,28 @@
   }
 
   /**
+   * Returns the range which covers all the Endnotes.
+  */
+  public Range getEndnoteRange() {
+          return new Range(
+                          _cpSplit.getEndNoteStart(),
+                          _cpSplit.getEndNoteEnd(),
+                          this
+      );
+  }
+
+  /**
+   * Returns the range which covers all the Endnotes.
+  */
+  public Range getCommentsRange() {
+          return new Range(
+                          _cpSplit.getCommentsStart(),
+                          _cpSplit.getCommentsEnd(),
+                          this
+      );
+  }
+
+  /**
    * Returns the range which covers all "Header Stories".
    * A header story contains a header, footer, end note
    *  separators and footnote separators.
Index: src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java
===================================================================
--- src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java	(revision 787160)
+++ src/scratchpad/src/org/apache/poi/hwpf/extractor/WordExtractor.java	(working copy)
@@ -22,6 +22,7 @@
 import java.io.FileInputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.Iterator;
+import java.util.Arrays;
 
 import org.apache.poi.POIOLE2TextExtractor;
 import org.apache.poi.hwpf.HWPFDocument;
@@ -95,34 +96,58 @@
 	 * Get the text from the word file, as an array with one String
 	 *  per paragraph
 	 */
-	public String[] getParagraphText() {
-		String[] ret;
+        public String[] getParagraphText() {
+                String[] ret;
 
-		// Extract using the model code
-		try {
-	    	Range r = doc.getRange();
+                // Extract using the model code
+                try {
+                        Range r = doc.getRange();
 
-			ret = new String[r.numParagraphs()];
-			for(int i=0; i<ret.length; i++) {
-				Paragraph p = r.getParagraph(i);
-				ret[i] = p.text();
+                        ret = getParagraphText(r);
+                } catch (Exception e) {
+                        // Something's up with turning the text pieces into paragraphs
+                        // Fall back to ripping out the text pieces
+                        ret = new String[1];
+                        ret[0] = getTextFromPieces();
+                }
 
-				// Fix the line ending
-				if(ret[i].endsWith("\r")) {
-					ret[i] = ret[i] + "\n";
-				}
-			}
-		} catch(Exception e) {
-			// Something's up with turning the text pieces into paragraphs
-			// Fall back to ripping out the text pieces
-			ret = new String[1];
-			ret[0] = getTextFromPieces();
-		}
+                return ret;
+        }
 
-		return ret;
-	}
+        public String[] getFootnoteText() {
+                Range r = doc.getFootnoteRange();
 
-	/**
+                return getParagraphText(r);
+        }
+
+        public String[] getEndnoteText() {
+                Range r = doc.getEndnoteRange();
+
+                return getParagraphText(r);
+        }
+
+        public String[] getCommentsText() {
+                Range r = doc.getCommentsRange();
+
+                return getParagraphText(r);
+        }
+
+        private String[] getParagraphText(Range r) {
+                String[] ret;
+                ret = new String[r.numParagraphs()];
+                for (int i = 0; i < ret.length; i++) {
+                        Paragraph p = r.getParagraph(i);
+                        ret[i] = p.text();
+
+                        // Fix the line ending
+                        if (ret[i].endsWith("\r")) {
+                                ret[i] = ret[i] + "\n";
+                        }
+                }
+                return ret;
+        }
+
+        /**
 	 * Add the header/footer text, if it's not empty
 	 */
 	private void appendHeaderFooter(String text, StringBuffer out) {
Index: src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java
===================================================================
--- src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java	(revision 787160)
+++ src/scratchpad/testcases/org/apache/poi/hwpf/extractor/TestWordExtractor.java	(working copy)
@@ -60,6 +60,8 @@
 	private String filename4;
 	// With unicode header and footer
 	private String filename5;
+        // With footnote
+        private String filename6;
 
     protected void setUp() throws Exception {
 		String dirname = System.getProperty("HWPF.testdata.path");
@@ -70,6 +72,7 @@
 		filename3 = pdirname + "/excel_with_embeded.xls";
 		filename4 = dirname + "/ThreeColHeadFoot.doc";
 		filename5 = dirname + "/HeaderFooterUnicode.doc";
+                filename6 = dirname + "/footnote.doc";
 
 		extractor = new WordExtractor(new FileInputStream(filename));
 		extractor2 = new WordExtractor(new FileInputStream(filename2));
@@ -226,4 +229,49 @@
     			text.indexOf("The footer, with") > -1
     	);
     }
+
+    public void testFootnote() throws Exception {
+        HWPFDocument doc = new HWPFDocument(
+                new FileInputStream(filename6)
+        );
+        extractor = new WordExtractor(doc);
+
+        String[] text = extractor.getFootnoteText();
+        StringBuffer b = new StringBuffer();
+        for (int i=0; i<text.length; i++) {
+            b.append(text[i]);
+        }
+
+        assertTrue(b.toString().contains("TestFootnote"));
+    }
+
+    public void testEndnote() throws Exception {
+        HWPFDocument doc = new HWPFDocument(
+                new FileInputStream(filename6)
+        );
+        extractor = new WordExtractor(doc);
+
+        String[] text = extractor.getEndnoteText();
+        StringBuffer b = new StringBuffer();
+        for (int i=0; i<text.length; i++) {
+            b.append(text[i]);
+        }
+
+        assertTrue(b.toString().contains("TestEndnote"));
+    }
+
+    public void testComments() throws Exception {
+        HWPFDocument doc = new HWPFDocument(
+                new FileInputStream(filename6)
+        );
+        extractor = new WordExtractor(doc);
+
+        String[] text = extractor.getCommentsText();
+        StringBuffer b = new StringBuffer();
+        for (int i=0; i<text.length; i++) {
+            b.append(text[i]);
+        }
+
+        assertTrue(b.toString().contains("TestComment"));
+    }
 }