Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -448,11 +448,13 @@
 	mkdir -p reindent
 	echo "Indent modified files are put here." > reindent/README
 
 reindent/%.scm : %.scm reindent/README
 	cp $< reindent
-	cd reindent;emacs -batch $< --eval '(indent-region (point-min) (point-max) nil)' -f save-buffer
+	cd reindent;emacs -batch $< --eval '(load "$(PWD)/reindent.el")' -f save-buffer
+
+# cd reindent;emacs -batch $< --eval '(indent-region (point-min) (point-max) nil)' -f save-buffer
 
 
 #======================================================================
 # Attic
 #======================================================================

Index: adjutant.scm
==================================================================
--- adjutant.scm
+++ adjutant.scm
@@ -18,13 +18,12 @@
 
 ;;======================================================================
 
 (declare (unit adjutant))
 
-(module adjutant
-	*
-	
+(module adjutant *
+
 (import scheme chicken data-structures extras files)
 (import (prefix sqlite3 sqlite3:) posix typed-records srfi-18 srfi-69
 	md5 message-digest
 	regex srfi-1)
 

ADDED   reindent.el
Index: reindent.el
==================================================================
--- /dev/null
+++ reindent.el
@@ -0,0 +1,14 @@
+; Indenting module body code at column 0
+(defun scheme-module-indent (state indent-point normal-indent) 0)
+(put 'module 'scheme-indent-function 'scheme-module-indent)
+
+(put 'and-let* 'scheme-indent-function 1)
+(put 'parameterize 'scheme-indent-function 1)
+(put 'handle-exceptions 'scheme-indent-function 1)
+(put 'when 'scheme-indent-function 1)
+(put 'unless 'scheme-indent-function 1)
+(put 'match 'scheme-indent-function 1)
+(put 'let-values 'scheme-indent-function 1)
+
+;; do the work
+(indent-region (point-min) (point-max) nil)

Index: ulex/ulex.scm
==================================================================
--- ulex/ulex.scm
+++ ulex/ulex.scm
@@ -25,12 +25,11 @@
 ;;
 ;;======================================================================
 
 (use mailbox)
 
-(module ulex
-    *
+(module ulex *
 
 (import scheme posix chicken data-structures ports extras files mailbox)
 (import srfi-18 pkts matchable regex
 	typed-records srfi-69 srfi-1
 	srfi-4 regex-case