Index: src/main.mk
==================================================================
--- src/main.mk
+++ src/main.mk
@@ -438,12 +438,15 @@
  $(OBJDIR)/zip.o
 
 APPNAME = fossil$(E)
 
 
+COMPNAME = completion.sh
 
-all:	$(OBJDIR) $(APPNAME)
+
+
+all:	$(OBJDIR) $(APPNAME) $(COMPNAME)
 
 install:	$(APPNAME)
 	mkdir -p $(INSTALLDIR)
 	mv $(APPNAME) $(INSTALLDIR)
 
@@ -587,15 +590,15 @@
 #
 $(SRCDIR)/../manifest:
 	# noop
 
 clean:
-	rm -rf $(OBJDIR)/* $(APPNAME)
+	rm -rf $(OBJDIR)/* $(APPNAME) $(COMPNAME)
 
 
-$(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
-	$(OBJDIR)/mkindex $(TRANS_SRC) >$@
+$(OBJDIR)/page_index.h $(COMPNAME): $(TRANS_SRC) $(OBJDIR)/mkindex
+	$(OBJDIR)/mkindex --compfile $(COMPNAME) $(TRANS_SRC) >$(OBJDIR)/page_index.h
 
 $(OBJDIR)/builtin_data.h: $(OBJDIR)/mkbuiltin $(EXTRA_FILES)
 	$(OBJDIR)/mkbuiltin --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
 
 $(OBJDIR)/headers:	$(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h

Index: src/makemake.tcl
==================================================================
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -281,16 +281,18 @@
   writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
 }
 writeln "\n"
 writeln "APPNAME = $name\$(E)"
 writeln "\n"
+writeln "COMPNAME = completion.sh"
+writeln "\n"
 
 writeln [string map [list \
     <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n                 "] \
     <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n                "] \
     <<<MINIZ_OPTIONS>>> [join $MINIZ_OPTIONS " \\\n                "]] {
-all:	$(OBJDIR) $(APPNAME)
+all:	$(OBJDIR) $(APPNAME) $(COMPNAME)
 
 install:	$(APPNAME)
 	mkdir -p $(INSTALLDIR)
 	mv $(APPNAME) $(INSTALLDIR)
 
@@ -413,11 +415,11 @@
 #
 $(SRCDIR)/../manifest:
 	# noop
 
 clean:
-	rm -rf $(OBJDIR)/* $(APPNAME)
+	rm -rf $(OBJDIR)/* $(APPNAME) $(COMPNAME)
 
 }
 
 set mhargs {}
 foreach s [lsort $src] {
@@ -427,12 +429,12 @@
 append mhargs "\$(SRCDIR)/sqlite3.h <<<NEXT_LINE>>>"
 append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
 #append mhargs "\$(SRCDIR)/cson_amalgamation.h <<<NEXT_LINE>>>"
 append mhargs "\$(OBJDIR)/VERSION.h"
 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
-writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
-writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
+writeln "\$(OBJDIR)/page_index.h \$(COMPNAME): \$(TRANS_SRC) \$(OBJDIR)/mkindex"
+writeln "\t\$(OBJDIR)/mkindex --compfile \$(COMPNAME) \$(TRANS_SRC) >\$(OBJDIR)/page_index.h\n"
 
 writeln "\$(OBJDIR)/builtin_data.h: \$(OBJDIR)/mkbuiltin \$(EXTRA_FILES)"
 writeln "\t\$(OBJDIR)/mkbuiltin --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
 
 writeln "\$(OBJDIR)/headers:\t\$(OBJDIR)/page_index.h \$(OBJDIR)/builtin_data.h \$(OBJDIR)/makeheaders \$(OBJDIR)/VERSION.h"

Index: src/mkindex.c
==================================================================
--- src/mkindex.c
+++ src/mkindex.c
@@ -130,10 +130,15 @@
 /*
 ** Number of errors
 */
 int nErr = 0;
 
+/*
+** File name for completion bash script
+*/
+char *zComp;
+
 /*
 ** Duplicate N characters of a string.
 */
 char *string_dup(const char *zSrc, int n){
   char *z;
@@ -315,24 +320,36 @@
 }
 
 /*
 ** Compare two entries
 */
-int e_compare(const void *a, const void *b){
+int e_compare_path(const void *a, const void *b){
   const Entry *pA = (const Entry*)a;
   const Entry *pB = (const Entry*)b;
   return strcmp(pA->zPath, pB->zPath);
 }
+
+/*
+** Compare two entries by type
+*/
+int e_compare_type(const void *a, const void *b){
+  const Entry *pA = (const Entry*)a;
+  const Entry *pB = (const Entry*)b;
+  if( pA->eType < pB->eType ) return -1;
+  if( pA->eType > pB->eType ) return 1;
+  return 0;
+}
 
 /*
 ** Build the binary search table.
 */
 void build_table(void){
   int i;
   int nWeb = 0;
+  FILE *comp;
 
-  qsort(aEntry, nFixed, sizeof(aEntry[0]), e_compare);
+  qsort(aEntry, nFixed, sizeof(aEntry[0]), e_compare_path);
 
   printf(
     "/* Automatically generated code\n"
     "** DO NOT EDIT!\n"
     "**\n"
@@ -388,10 +405,51 @@
     );
     if( aEntry[i].zIf ) printf("#endif\n");
   }
   printf("};\n");
   printf("#define FOSSIL_FIRST_CMD %d\n", nWeb);
+  
+  /* Generate bash completion script */
+  comp = fopen(zComp, "w");
+  if( comp==0 ){
+    fprintf(stderr,"%s: cannot open completion script file\n", zComp);
+  }else{
+    qsort(aEntry, nFixed, sizeof(aEntry[0]), e_compare_type);
+    
+    fprintf(comp,
+      "_fossil_comp(){\n"
+        "local cur opts1 opts2\n"
+        "COMPREPLY=()\n"
+        "cur=\"${COMP_WORDS[COMP_CWORD]}\"\n"
+    );
+    fprintf(comp, "opts1=\"");
+    for(i=nWeb+1;
+        i<nFixed && aEntry[i].eType==(CMDFLAG_COMMAND|CMDFLAG_1ST_TIER);
+        i++)
+    {
+      fprintf(comp, "%s ", aEntry[i].zPath);
+    }
+    fprintf(comp, "\"\n");
+    fprintf(comp, "opts2=\"");
+    for( ;
+        i<nFixed && aEntry[i].eType==(CMDFLAG_COMMAND|CMDFLAG_2ND_TIER);
+        i++)
+    {
+      fprintf(comp, "%s ", aEntry[i].zPath);
+    }
+    fprintf(comp, "\"\n");
+    fprintf(comp,
+        "COMPREPLY=($(compgen -W \"${opts1}\" -- ${cur}))\n"
+        "if [ ${#COMPREPLY[@]} -eq 0 ]; then\n"
+          "COMPREPLY=($(compgen -W \"${opts2}\" -- ${cur}))\n"
+        "fi\n"
+        "return 0\n"
+      "}\n"
+      "complete -F _fossil_comp fossil"
+    );
+    fclose(comp);
+  }
 }
 
 /*
 ** Process a single file of input
 */
@@ -415,11 +473,18 @@
 }
 
 int main(int argc, char **argv){
   int i;
   for(i=1; i<argc; i++){
+    if( argv[i][0]=='-' && strcmp(argv[i], "--compfile")==0 ){
+      if( ++i < argc ){
+        zComp = argv[i];
+      }else{
+        fprintf(stderr,"no file name supplied to --compfile\n");
+      }
+    }
     zFile = argv[i];
     process_file();
   }
   build_table();
   return nErr;
 }