diff --git a/Makefile.in b/Makefile.in
index 3b203e9d1a..a533a2c4d8 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -414,7 +414,7 @@ testfixture$(TEXE):	$(TOP)/src/tclsqlite.c libtclsqlite3.la libsqlite3.la $(TEST
 	$(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1\
                 $(THREADSAFE) $(TEMP_STORE)\
                 -o testfixture $(TESTSRC) $(TOP)/src/tclsqlite.c \
-		libtclsqlite3.la libsqlite3.la $(LIBTCL)
+		libtclsqlite3.la $(LIBTCL)
 
 crashtest$(TEXE):	$(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) $(TOP)/src/os_test.c
 	$(LTLINK) -DOS_TEST=1 -DTCLSH=1 -DSQLITE_TEST=1 \
@@ -430,6 +430,19 @@ fulltest:	testfixture$(TEXE) sqlite3$(TEXE) crashtest$(TEXE)
 test:	testfixture$(TEXE) sqlite3$(TEXE)
 	./testfixture $(TOP)/test/quick.test
 
+sqlite3_analyzer$(TEXE):	$(TOP)/src/tclsqlite.c libtclsqlite3.la \
+				$(TESTSRC) $(TOP)/tool/spaceanal.tcl
+	sed \
+	  -e '/^#/d' \
+	  -e 's,\\,\\\\,g' \
+	  -e 's,",\\",g' \
+	  -e 's,^,",' \
+	  -e 's,$$,\\n",' \
+	  $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
+	$(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1\
+                $(THREADSAFE) $(TEMP_STORE)\
+                -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
+		libtclsqlite3.la $(LIBTCL)
 
 # Rules used to build documentation
 #
diff --git a/manifest b/manifest
index 919334c554..79453b5000 100644
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Disable\sthe\scursors.\s\s"make\sinstall"\snow\sbuilds\sand\sinstalls\sa\sTCL\spackage\nfor\sSQLite\sif\sTCL\sis\sinstalled\son\sthe\ssystem.\s(CVS\s2153)
-D 2004-11-27T15:52:16
-F Makefile.in 30a4edb59e7b6d1595d3398b627560c4b47ff7ab
+C Get\sthe\sbuild\sof\ssqlite3_analyzer\sworking\swith\sMakefile.in.\s(CVS\s2154)
+D 2004-12-02T20:17:01
+F Makefile.in da09f379b80c8cd78d78abaa0f32ca90a124e884
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README a01693e454a00cc117967e3f9fdab2d4d52e9bc1
 F VERSION 342b6d5fde93b6d45023e2fee0163dda6464b9d6
@@ -64,7 +64,7 @@ F src/shell.c e8f4f486cbf6e60d81173146ac8a6522c930fa51
 F src/sqlite.h.in f4a0e527c84281aef7aaa5afb027b00159c97f71
 F src/sqliteInt.h 1dc643cf84f1d83bd45e314f724bb824ee24c000
 F src/table.c 25b3ff2b39b7d87e8d4a5da0713d68dfc06cbee9
-F src/tclsqlite.c 4a9dad39dc41e959eefe3117670ac1aa45a353c2
+F src/tclsqlite.c 68b45ae5a96424abdc1732cb03b1efbb0c1821b3
 F src/test1.c b7d94c54e58f95452387a5cabdf98b2be8059f29
 F src/test2.c b11fa244fff02190707dd0879987c37c75e61fc8
 F src/test3.c 6f1ec93e13632a004b527049535079eda84c459d
@@ -262,7 +262,7 @@ F www/tclsqlite.tcl 560ecd6a916b320e59f2917317398f3d59b7cc25
 F www/vdbe.tcl 095f106d93875c94b47367384ebc870517431618
 F www/version3.tcl 092a01f5ef430d2c4acc0ae558d74c4bb89638a0
 F www/whentouse.tcl fdacb0ba2d39831e8a6240d05a490026ad4c4e4c
-P 12424bef7770f3d256d386251477a1da78be2bde
-R cb5714e0d126a2a4bbea5655c8a2079c
+P d75014c299496a02f6850545beb0ab669802bf87
+R 59ee0077c73ea218abb0e30b9f6d0555
 U drh
-Z 37958e4e7f56b2ee1d4002e37fda394f
+Z f3bab5fdb442cbf5388edb1fd0d9e34d
diff --git a/manifest.uuid b/manifest.uuid
index 06560fed88..61b5fb0a53 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d75014c299496a02f6850545beb0ab669802bf87
\ No newline at end of file
+f7415a0d6433980ff6c25cf2238f5e9881c38873
\ No newline at end of file
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 1ef3f6e378..8452e372ef 100644
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.108 2004/11/23 15:41:16 danielk1977 Exp $
+** $Id: tclsqlite.c,v 1.109 2004/12/02 20:17:02 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -1287,7 +1287,7 @@ int TCLSH_MAIN(int argc, char **argv){
     int i;
     Tcl_SetVar(interp,"argv0",argv[1],TCL_GLOBAL_ONLY);
     Tcl_SetVar(interp,"argv", "", TCL_GLOBAL_ONLY);
-    for(i=2; i<argc; i++){
+    for(i=3-TCLSH; i<argc; i++){
       Tcl_SetVar(interp, "argv", argv[i],
           TCL_GLOBAL_ONLY | TCL_LIST_ELEMENT | TCL_APPEND_VALUE);
     }