Index: ext/fts3/fts3.c
==================================================================
--- ext/fts3/fts3.c
+++ ext/fts3/fts3.c
@@ -1049,10 +1049,12 @@
 }
 
 static void fts3ColumnlistCopy(char **pp, char **ppPoslist){
   char *pEnd = *ppPoslist;
   char c = 0;
+
+  /* A column-list is terminated by either a 0x01 or 0x00. */
   while( 0xFE & (*pEnd | c) ) c = *pEnd++ & 0x80;
   if( pp ){
     int n = (int)(pEnd - *ppPoslist);
     char *p = *pp;
     memcpy(p, *ppPoslist, n);
@@ -1104,12 +1106,24 @@
         fts3PutDeltaVarint(&p, &iPrev, (i1<i2 ? i1 : i2) + 2); iPrev -= 2;
         if( 0==(*p1&0xFE) ) i1 = 0x7FFFFFFF;
         if( 0==(*p2&0xFE) ) i2 = 0x7FFFFFFF;
       }
     }else if( iCol1<iCol2 ){
+      if( iCol1 ){
+        int n = sqlite3Fts3PutVarint(&p[1], iCol1);
+        *p = 0x01;
+        p += n+1;
+        p1 += n+1;
+      }
       fts3ColumnlistCopy(&p, &p1);
     }else{
+      if( iCol2 ){
+        int n = sqlite3Fts3PutVarint(&p[1], iCol2);
+        *p = 0x01;
+        p += n+1;
+        p2 += n+1;
+      }
       fts3ColumnlistCopy(&p, &p2);
     }
   }
 
   *p++ = '\0';

Index: test/fts3rnd.test
==================================================================
--- test/fts3rnd.test
+++ test/fts3rnd.test
@@ -89,10 +89,41 @@
   }
   lsort -integer $ret
 }
 
 proc simple_near {termlist nNear} {
+  set ret [list]
+
+  # List of nNear+1 elements that contains no terms.
+  #
+  set dummyfields "[string repeat "X " $nNear]X"
+
+  foreach {key value} [array get ::t1] {
+    foreach v $value {
+      set v [concat $dummyfields $v $dummyfields]
+
+      set l [lsearch -exact -all $v [lindex $termlist 0]]
+      foreach T [lrange $termlist 1 end] {
+        set l2 [list]
+        foreach i $l {
+          set iStart [expr $i - $nNear - 1]
+          set iEnd [expr $i + $nNear + 1]
+          foreach i2 [lsearch -exact -all [lrange $v $iStart $iEnd] $T] {
+            incr i2 $iStart
+            if {$i2 != $i} { lappend l2 $i2 } 
+          }
+        }
+        set l $l2
+      }
+
+      if {[llength $l]} {
+        lappend ret $key
+      } 
+    }
+  }
+
+  lsort -unique -integer $ret
 }
 
 foreach nodesize {50 500 1000 2000} {
   catch { array unset ::t1 }
 
@@ -169,18 +200,28 @@
       } [simple_term $term]
     }
 
     # A NEAR query with terms as the arguments.
     #
-if 0 {
     for {set i 0} {$i < 10} {incr i} {
       set terms [list [random_term] [random_term]]
       set match [join $terms " NEAR "]
-      do_test fts3rnd-1.$nodesize.$iTest.5.$i {
+      do_test fts3rnd-1.$nodesize.$iTest.5.$i.$match {
+        execsql { SELECT docid FROM t1 WHERE t1 MATCH $match }
+      } [simple_near $terms 10]
+    }
+ 
+if 0 {
+    # A 3-way NEAR query with terms as the arguments.
+    #
+    for {set i 0} {$i < 10} {incr i} {
+      set terms [list [random_term] [random_term] [random_term]]
+      set match [join $terms " NEAR "]
+      do_test fts3rnd-1.$nodesize.$iTest.5.$i.$match {
         execsql { SELECT docid FROM t1 WHERE t1 MATCH $match }
       } [simple_near $terms 10]
     }
 }
   }
 }
 
 finish_test