Index: Setup/archive.bat
==================================================================
--- Setup/archive.bat
+++ Setup/archive.bat
@@ -14,13 +14,10 @@
 REM SET _ECHO=ECHO
 IF NOT DEFINED _AECHO (SET _AECHO=REM)
 IF NOT DEFINED _CECHO (SET _CECHO=REM)
 IF NOT DEFINED _VECHO (SET _VECHO=REM)
 
-SET PIPE=^|
-IF DEFINED _ECHO SET PIPE=^^^|
-
 %_AECHO% Running %0 %*
 
 SET ROOT=%~dp0\..
 SET ROOT=%ROOT:\\=\%
 
@@ -37,11 +34,41 @@
 IF ERRORLEVEL 1 (
   ECHO Could not change directory to "%ROOT%".
   GOTO errors
 )
 
-%_ECHO% zip.exe -r sqlite-dotnet-source.zip * -x@exclude_src.txt
+FOR /F "delims=" %%V IN ('find.exe "AssemblyVersion" System.Data.SQLite\AssemblyInfo.cs') DO (
+  SET VERSION=%%V
+)
+
+IF NOT DEFINED VERSION (
+  SET VERSION=1.0.0.0
+  GOTO skip_mungeVersion
+)
+
+REM
+REM NOTE: Strip off all the extra stuff from the AssemblyVersion line we found
+REM       in the AssemblyInfo.cs file that we do not need (i.e. everything
+REM       except the raw version number itself).
+REM
+SET VERSION=%VERSION:(=%
+SET VERSION=%VERSION:)=%
+SET VERSION=%VERSION:[=%
+SET VERSION=%VERSION:]=%
+SET VERSION=%VERSION: =%
+SET VERSION=%VERSION:assembly:=%
+SET VERSION=%VERSION:AssemblyVersion=%
+SET VERSION=%VERSION:"=%
+REM "
+
+:skip_mungeVersion
+
+%_VECHO% Version = '%VERSION%'
+
+CALL :fn_ResetErrorLevel
+
+%_ECHO% zip.exe -r sqlite-dotnet-source-%VERSION%.zip * -x@exclude_src.txt
 
 IF ERRORLEVEL 1 (
   ECHO Failed to archive source files.
   GOTO errors
 )

Index: exclude_src.txt
==================================================================
--- exclude_src.txt
+++ exclude_src.txt
@@ -12,10 +12,12 @@
 obj/*
 Setup/Output/*
 SQLite.Designer/obj/*
 System.Data.SQLite.Linq/obj/*
 System.Data.SQLite/obj/*
+System.Data.SQLite/Properties/*
 test/obj/*
 testce/obj/*
 testlinq/obj/*
 Tests/*
+tools/*
 www/*