diff --git a/src/demo/org/apache/lucene/demo/HTMLDocument.java b/src/demo/org/apache/lucene/demo/HTMLDocument.java
index 48505469fcc..663b8dea564 100644
--- a/src/demo/org/apache/lucene/demo/HTMLDocument.java
+++ b/src/demo/org/apache/lucene/demo/HTMLDocument.java
@@ -45,21 +45,21 @@ public class HTMLDocument {
     // make a new, empty document
     Document doc = new Document();
 
-    // Add the url as a field named "path".  Use a Keyword field, so 
-    // that it's searchable, but so that no attempt is made
-    // to tokenize the field into words.
-    doc.add(Field.Keyword("path", f.getPath().replace(dirSep, '/')));
+    // Add the url as a field named "path".  Use a field that is 
+    // indexed (i.e. searchable), but don't tokenize the field into words.
+    doc.add(new Field("path", f.getPath().replace(dirSep, '/'), Field.Store.YES,
+        Field.Index.UN_TOKENIZED));
 
-    // Add the last modified date of the file a field named "modified".  Use a
-    // Keyword field, so that it's searchable, but so that no attempt is made
-    // to tokenize the field into words.
-    doc.add(Field.Keyword("modified",
-			  DateField.timeToString(f.lastModified())));
+    // Add the last modified date of the file a field named "modified".  
+    // Use a field that is indexed (i.e. searchable), but don't tokenize
+    // the field into words.
+    doc.add(new Field("modified", DateField.timeToString(f.lastModified()),
+        Field.Store.YES, Field.Index.UN_TOKENIZED));
 
     // Add the uid as a field, so that index can be incrementally maintained.
     // This field is not stored with document, it is indexed, but it is not
     // tokenized prior to indexing.
-    doc.add(new Field("uid", uid(f), false, true, false));
+    doc.add(new Field("uid", uid(f), Field.Store.NO, Field.Index.UN_TOKENIZED));
 
     FileInputStream fis = null;
     try {
@@ -68,15 +68,14 @@ public class HTMLDocument {
       
       // Add the tag-stripped contents as a Reader-valued Text field so it will
       // get tokenized and indexed.
-      doc.add(Field.Text("contents", parser.getReader()));
+      doc.add(new Field("contents", parser.getReader()));
 
-      // Add the summary as an UnIndexed field, so that it is stored and returned
-      // with hit documents for display.
-      doc.add(Field.UnIndexed("summary", parser.getSummary()));
+      // Add the summary as a field that is stored and returned with
+      // hit documents for display.
+      doc.add(new Field("summary", parser.getSummary(), Field.Store.YES, Field.Index.NO));
 
-      // Add the title as a separate Text field, so that it can be searched
-      // separately.
-      doc.add(Field.Text("title", parser.getTitle()));
+      // Add the title as a field that it can be searched and that is stored.
+      doc.add(new Field("title", parser.getTitle(), Field.Store.YES, Field.Index.TOKENIZED));
     } finally {
       if (fis != null)
         fis.close();