Index: src/java/org/apache/lucene/document/Field.java
===================================================================
--- src/java/org/apache/lucene/document/Field.java	(revision 763026)
+++ src/java/org/apache/lucene/document/Field.java	(working copy)
@@ -329,6 +329,8 @@
     if (index == Index.NO) {
       this.isIndexed = false;
       this.isTokenized = false;
+      this.omitTermFreqAndPositions = false;
+      this.omitNorms = true;
     } else if (index == Index.ANALYZED) {
       this.isIndexed = true;
       this.isTokenized = true;
@@ -492,6 +494,8 @@
     
     isIndexed   = false;
     isTokenized = false;
+    omitTermFreqAndPositions = false;
+    omitNorms = true;
     
     isBinary    = true;
     binaryLength = length;
Index: src/java/org/apache/lucene/index/FieldInfo.java
===================================================================
--- src/java/org/apache/lucene/index/FieldInfo.java	(revision 763026)
+++ src/java/org/apache/lucene/index/FieldInfo.java	(working copy)
@@ -38,12 +38,21 @@
     name = na;
     isIndexed = tk;
     number = nu;
-    this.storeTermVector = storeTermVector;
-    this.storeOffsetWithTermVector = storeOffsetWithTermVector;
-    this.storePositionWithTermVector = storePositionWithTermVector;
-    this.omitNorms = omitNorms;
-    this.storePayloads = storePayloads;
-    this.omitTermFreqAndPositions = omitTermFreqAndPositions;
+    if (isIndexed) {
+      this.storeTermVector = storeTermVector;
+      this.storeOffsetWithTermVector = storeOffsetWithTermVector;
+      this.storePositionWithTermVector = storePositionWithTermVector;
+      this.storePayloads = storePayloads;
+      this.omitNorms = omitNorms;
+      this.omitTermFreqAndPositions = omitTermFreqAndPositions;
+    } else { // for non-indexed fields, leave defaults
+      this.storeTermVector = false;
+      this.storeOffsetWithTermVector = false;
+      this.storePositionWithTermVector = false;
+      this.storePayloads = false;
+      this.omitNorms = true;
+      this.omitTermFreqAndPositions = false;
+    }
   }
 
   public Object clone() {
@@ -56,23 +65,25 @@
     if (this.isIndexed != isIndexed) {
       this.isIndexed = true;                      // once indexed, always index
     }
-    if (this.storeTermVector != storeTermVector) {
-      this.storeTermVector = true;                // once vector, always vector
+    if (isIndexed) { // if updated field data is not for indexing, leave the updates out
+      if (this.storeTermVector != storeTermVector) {
+        this.storeTermVector = true;                // once vector, always vector
+      }
+      if (this.storePositionWithTermVector != storePositionWithTermVector) {
+        this.storePositionWithTermVector = true;                // once vector, always vector
+      }
+      if (this.storeOffsetWithTermVector != storeOffsetWithTermVector) {
+        this.storeOffsetWithTermVector = true;                // once vector, always vector
+      }
+      if (this.storePayloads != storePayloads) {
+        this.storePayloads = true;
+      }
+      if (this.omitNorms != omitNorms) {
+        this.omitNorms = false;                // once norms are stored, always store
+      }
+      if (this.omitTermFreqAndPositions != omitTermFreqAndPositions) {
+        this.omitTermFreqAndPositions = true;                // if one require omitTermFreqAndPositions at least once, it remains off for life
+      }
     }
-    if (this.storePositionWithTermVector != storePositionWithTermVector) {
-      this.storePositionWithTermVector = true;                // once vector, always vector
-    }
-    if (this.storeOffsetWithTermVector != storeOffsetWithTermVector) {
-      this.storeOffsetWithTermVector = true;                // once vector, always vector
-    }
-    if (this.omitNorms != omitNorms) {
-      this.omitNorms = false;                // once norms are stored, always store
-    }
-    if (this.omitTermFreqAndPositions != omitTermFreqAndPositions) {
-      this.omitTermFreqAndPositions = true;                // if one require omitTermFreqAndPositions at least once, it remains off for life
-    }
-    if (this.storePayloads != storePayloads) {
-      this.storePayloads = true;
-    }
   }
 }
Index: src/java/org/apache/lucene/index/FieldsReader.java
===================================================================
--- src/java/org/apache/lucene/index/FieldsReader.java	(revision 763026)
+++ src/java/org/apache/lucene/index/FieldsReader.java	(working copy)
@@ -322,6 +322,7 @@
         //skip over the part that we aren't loading
         fieldsStream.seek(pointer + toRead);
         f.setOmitNorms(fi.omitNorms);
+        f.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
       } else {
         int length = fieldsStream.readVInt();
         long pointer = fieldsStream.getFilePointer();
@@ -332,6 +333,7 @@
           fieldsStream.skipChars(length);
         f = new LazyField(fi.name, store, index, termVector, length, pointer, binary);
         f.setOmitNorms(fi.omitNorms);
+        f.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
       }
       doc.add(f);
     }
@@ -383,6 +385,7 @@
                 store,
                 index,
                 termVector);
+        f.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
         f.setOmitNorms(fi.omitNorms);
       } else {
         f = new Field(fi.name,     // name
@@ -390,6 +393,7 @@
                 store,
                 index,
                 termVector);
+        f.setOmitTermFreqAndPositions(fi.omitTermFreqAndPositions);
         f.setOmitNorms(fi.omitNorms);
       }
       doc.add(f);
@@ -641,6 +645,7 @@
       this.name = fi.name.intern();
       this.isIndexed = fi.isIndexed;
       this.omitNorms = fi.omitNorms;          
+      this.omitTermFreqAndPositions = fi.omitTermFreqAndPositions;
       this.storeOffsetWithTermVector = fi.storeOffsetWithTermVector;
       this.storePositionWithTermVector = fi.storePositionWithTermVector;
       this.storeTermVector = fi.storeTermVector;