diff --git a/main.mk b/main.mk
index 8695b28597..82f3a41ad6 100644
--- a/main.mk
+++ b/main.mk
@@ -67,22 +67,10 @@ LIBOBJ = attach.o auth.o btree.o build.o copy.o date.o delete.o \
 # All of the source code files.
 #
 SRC = \
-  $(TOP)/src/btree.c \
-  $(TOP)/src/btree.h \
-  $(TOP)/src/hash.c \
-  $(TOP)/src/hash.h \
-  $(TOP)/src/os.c \
-  $(TOP)/src/pager.c \
-  $(TOP)/src/pager.h \
-  $(TOP)/src/random.c \
-  $(TOP)/src/util.c 
-
-SRC_ORIG = \
   $(TOP)/src/attach.c \
   $(TOP)/src/auth.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/btree.h \
-  $(TOP)/src/btree_rb.c \
   $(TOP)/src/build.c \
   $(TOP)/src/copy.c \
   $(TOP)/src/date.c \
@@ -109,6 +97,7 @@ SRC_ORIG = \
   $(TOP)/src/tclsqlite.c \
   $(TOP)/src/tokenize.c \
   $(TOP)/src/trigger.c \
+  $(TOP)/src/utf.c \
   $(TOP)/src/update.c \
   $(TOP)/src/util.c \
   $(TOP)/src/vacuum.c \
@@ -121,14 +110,6 @@ SRC_ORIG = \
 # Source code to the test files.
 #
 TESTSRC = \
-   $(TOP)/src/os.c \
-   $(TOP)/src/pager.c \
-   $(TOP)/src/test2.c \
-   $(TOP)/src/test3.c \
-   $(TOP)/src/test5.c \
-   $(TOP)/src/md5.c
-
-TESTSRC_ORIG = \
   $(TOP)/src/btree.c \
   $(TOP)/src/func.c \
   $(TOP)/src/os.c \
diff --git a/manifest b/manifest
index 7f2c312a8f..2ef2879985 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Updates\sto\ssqlite3BtreeKeyFetch()\sand\ssqlite3BtreeDataFetch().\s(CVS\s1347)
-D 2004-05-11T00:58:56
+C Update\sthe\smain.mk\smakefile\sso\sthat\sit\sbuilds\severything\sagain.\s(CVS\s1348)
+D 2004-05-11T01:18:25
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -15,7 +15,7 @@ F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
-F main.mk e351e8ed7c55c2031842adc77c5f9bb2e0d7ea26
+F main.mk 167a4c8759531ce5d4eece431c3b962534eee157
 F publish.sh 1cd5c982388560fa91eedf6a338e210f713b35c8
 F spec.template a38492f1c1dd349fc24cb0565e08afc53045304b
 F sqlite.1 83f4a9d37bdf2b7ef079a82d54eaf2e3509ee6ea
@@ -188,7 +188,7 @@ F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P c080fed7b58e754bb34afe597ff3b2f399c7d313
-R 8d721f5b30f9e9c24be64343355846eb
+P a675ac49882887dfcbf671e9092a29aca9eb694e
+R e4298f2dca6b4eb015412d2c78eef0b6
 U drh
-Z c086113e1e7bdfbe291de2f300b02c98
+Z e408df7d35442709fba413b4e2b48938
diff --git a/manifest.uuid b/manifest.uuid
index 19cf852f72..3c7665da13 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a675ac49882887dfcbf671e9092a29aca9eb694e
\ No newline at end of file
+e6e52fc2e62835712d6b92a19fdbd2ba15b2e9cd
\ No newline at end of file