diff --git a/manifest b/manifest
index 3a542a5ab8..90c76c95a7 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\s"affected"\sinstead\sof\s"effected".\sTicket\s#2589.\sNo\scode\schanges.\s(CVS\s4309)
-D 2007-08-28T08:19:49
+C Update\sthe\ssqlite3_vfs_register()\sdocumentation\sto\smake\r\nthe\sbehavior\sundefined\sfor\sVFSes\swith\sa\sNULL\sor\sempty\sstring\r\nas\sthe\sname\sor\swith\sduplicate\snames.\s(CVS\s4310)
+D 2007-08-28T15:21:45
 F Makefile.in e8296e112b8942a96c0ed504398bd0d43e3c67ce
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -126,7 +126,7 @@ F src/random.c 4a22746501bf36b0a088c66e38dde5daba6a35da
 F src/select.c 98c367bce3f38c5adfcc97de9ab5c79b0e5dc2b2
 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
 F src/shell.c ac29402b538515fa4697282387be9c1205e6e9eb
-F src/sqlite.h.in 4cf42ce749e4bdf13b9bb4959e91439c3ce8a054
+F src/sqlite.h.in da8b9380c32ad72cca3deb25ef43ed5707b6b6bd
 F src/sqlite3ext.h 9a26028378c288af500d8b94ed079666fed5806b
 F src/sqliteInt.h e681df44a19ffb6750d129802f124132ae240c83
 F src/sqliteLimit.h 1bcbbdfa856f8b71b561abb31edb864b0eca1d12
@@ -563,7 +563,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 0b80168895993af5774369f839f284712d006f0a
-R 7610277ea9051d836542a0c04579395a
-U danielk1977
-Z 95fb86aadcf396713336ecdc72fdd0e3
+P 4c5631ce347a25dd6df90e7e4395a55cd750c1c9
+R 3046317a55b31ec340f798a75ee5fd0a
+U drh
+Z 4d0250ba3b6ebc171f9648b0cd34f1b0
diff --git a/manifest.uuid b/manifest.uuid
index 93e74d46b4..30c6aa8982 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4c5631ce347a25dd6df90e7e4395a55cd750c1c9
\ No newline at end of file
+e7a98b48384ea581d98dad5118ee33468d526c62
\ No newline at end of file
diff --git a/src/sqlite.h.in b/src/sqlite.h.in
index 3b1af5e9cc..032c0895b1 100644
--- a/src/sqlite.h.in
+++ b/src/sqlite.h.in
@@ -30,7 +30,7 @@
 ** the version number) and changes its name to "sqlite3.h" as
 ** part of the build process.
 **
-** @(#) $Id: sqlite.h.in,v 1.244 2007/08/27 21:10:36 drh Exp $
+** @(#) $Id: sqlite.h.in,v 1.245 2007/08/28 15:21:45 drh Exp $
 */
 #ifndef _SQLITE3_H_
 #define _SQLITE3_H_
@@ -3238,7 +3238,10 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
 ** new VFS becomes the default VFS if the makeDflt flag is set.
 ** The same VFS can be registered multiple times without injury.
 ** To make an existing VFS into the default VFS, register it again
-** with the makeDflt flag set.
+** with the makeDflt flag set.  If two different VFSes with the
+** same name are registered, the behavior is undefined.  If a
+** VFS is registered with a name that is NULL or an empty string,
+** then the behavior is undefined.
 ** 
 ** Unregister a VFS with the sqlite3_vfs_unregister() interface.
 ** If the default VFS is unregistered, another VFS is chosen as