diff --git a/manifest b/manifest
index d82dcc4f32..de5762bf9d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\sfts5\sphrase\squeries\swith\scolumn\sfilters.
-D 2015-10-07T13:24:27.688
+C Adjustments\sto\sspellfix2.test\sso\sthat\sit\sworks\sreliably\son\smac.
+D 2015-10-07T16:14:18.747
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -1033,7 +1033,7 @@ F test/speed4p.explain 6b5f104ebeb34a038b2f714150f51d01143e59aa
 F test/speed4p.test 0e51908951677de5a969b723e03a27a1c45db38b
 F test/speedtest1.c 857439869d1cb4db35e1c720ee9c2756eb9ea2a0
 F test/spellfix.test 0597065ff57042df1f138e6a2611ae19c2698135
-F test/spellfix2.test 1ff48bb65b6198d21674ae24d19bb136e547585a
+F test/spellfix2.test dfc8f519a3fc204cb2dfa8b4f29821ae90f6f8c3
 F test/sqldiff1.test 8f6bc7c6a5b3585d350d779c6078869ba402f8f5
 F test/sqllimits1.test 89b3d5aad05b99f707ee3786bdd4416dccf83304
 F test/stat.test 8de91498c99f5298b303f70f1d1f3b9557af91bf
@@ -1390,7 +1390,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P accdc98b1291f07b802fd23f3ebc7dbc02ba09d3
-R 849224c9a19364ffbe4ccc562bb10fe7
-U dan
-Z 80e2525dbe861d7d6f96bf60c658b288
+P f20f9f813f00cefcd427e506a09b0b973c782e3f
+R 5c72368b779571d25566b43efcab6857
+U drh
+Z 9286de7475387911171425dc1c43ba95
diff --git a/manifest.uuid b/manifest.uuid
index dc4e1e9953..fbc538a962 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f20f9f813f00cefcd427e506a09b0b973c782e3f
\ No newline at end of file
+d591e860d3d7c61637b4b07989bf176cb337db2c
\ No newline at end of file
diff --git a/test/spellfix2.test b/test/spellfix2.test
index e9d6c693b2..d1a13284ea 100644
--- a/test/spellfix2.test
+++ b/test/spellfix2.test
@@ -76,40 +76,42 @@ do_execsql_test 1.5 {
 
 do_execsql_test 1.6 {
   SELECT word, distance, matchlen FROM demo 
-  WHERE word MATCH 'amstedam*' AND distance <= 100;
+  WHERE word MATCH 'amstedam*' AND distance <= 100
+  ORDER BY distance, word;
 } {
-  amsterdam         100 9        amsterdamh        100 9
-  amsterdamm        100 9        amsterdamn        100 9
-  amsterdama        100 9        amsterdame        100 9
-  amsterdami        100 9        amsterdamo        100 9
-  amsterdamu        100 9        amsterdamy        100 9
-  amsterdammetje    100 9        amsterdamania     100 9
-  amsterdamb        100 9        amsterdamf        100 9
-  amsterdamp        100 9        amsterdamv        100 9
-  amsterdamw        100 9        amsterdamweg      100 9
-  amsterdamc        100 9        amsterdamg        100 9
-  amsterdamj        100 9        amsterdamk        100 9
-  amsterdamq        100 9        amsterdams        100 9
-  amsterdamx        100 9        amsterdamz        100 9
-  amsterdamsestraat 100 9        amsterdamd        100 9
-  amsterdamt        100 9        amsterdaml        100 9
-  amsterdamlaan     100 9        amsterdamr        100 9
+  amsterdam         100 9        amsterdama        100 9
+  amsterdamania     100 9        amsterdamb        100 9
+  amsterdamc        100 9        amsterdamd        100 9
+  amsterdame        100 9        amsterdamf        100 9
+  amsterdamg        100 9        amsterdamh        100 9
+  amsterdami        100 9        amsterdamj        100 9
+  amsterdamk        100 9        amsterdaml        100 9
+  amsterdamlaan     100 9        amsterdamm        100 9
+  amsterdammetje    100 9        amsterdamn        100 9
+  amsterdamo        100 9        amsterdamp        100 9
+  amsterdamq        100 9        amsterdamr        100 9
+  amsterdams        100 9        amsterdamsestraat 100 9
+  amsterdamt        100 9        amsterdamu        100 9
+  amsterdamv        100 9        amsterdamw        100 9
+  amsterdamweg      100 9        amsterdamx        100 9
+  amsterdamy        100 9        amsterdamz        100 9
 }
 
 do_execsql_test 1.7 {
   SELECT word, distance, matchlen FROM demo 
-  WHERE word MATCH 'amstedam*' AND distance <= 100 AND top=20;
+  WHERE word MATCH 'amstedam*' AND distance <= 100 AND top=20
+  ORDER BY distance, word;
 } {
-  amsterdam         100 9        amsterdamh        100 9
-  amsterdamm        100 9        amsterdamn        100 9
-  amsterdama        100 9        amsterdame        100 9
-  amsterdami        100 9        amsterdamo        100 9
-  amsterdamu        100 9        amsterdamy        100 9
-  amsterdammetje    100 9        amsterdamania     100 9
-  amsterdamb        100 9        amsterdamf        100 9
-  amsterdamp        100 9        amsterdamv        100 9
-  amsterdamw        100 9        amsterdamweg      100 9
-  amsterdamc        100 9        amsterdamg        100 9
+  amsterdam         100 9        amsterdama        100 9
+  amsterdamania     100 9        amsterdamb        100 9
+  amsterdamc        100 9        amsterdame        100 9
+  amsterdamf        100 9        amsterdamg        100 9
+  amsterdamh        100 9        amsterdami        100 9
+  amsterdamm        100 9        amsterdammetje    100 9
+  amsterdamn        100 9        amsterdamo        100 9
+  amsterdamp        100 9        amsterdamu        100 9
+  amsterdamv        100 9        amsterdamw        100 9
+  amsterdamweg      100 9        amsterdamy        100 9
 }