diff --git a/Makefile b/Makefile
index 430fc86f..51d93666 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.41 2007-11-16 21:31:03 nicm Exp $
+# $Id: Makefile,v 1.42 2007-11-20 12:00:16 nicm Exp $
 
 .SUFFIXES: .c .o .y .h
 .PHONY: clean
@@ -63,6 +63,10 @@ CFLAGS+= -DUSE_LIBUTIL_H
 
 OBJS= ${SRCS:S/.c/.o/:S/.y/.o/}
 
+DISTDIR= ${PROG}-${VERSION}
+DISTFILES= *.[chyl] Makefile GNUmakefile *.[1-9] NOTES TODO \
+	   `find examples compat -type f -and ! -path '*CVS*'`
+
 CLEANFILES= ${PROG} *.o .depend *~ ${PROG}.core *.log
 
 .c.o:
@@ -80,6 +84,15 @@ ${PROG}:	${OBJS}
 depend:
 		mkdep ${CFLAGS} ${INCDIRS} ${SRCS:M*.c}
 
+dist:		clean
+		grep '^#DEBUG=' Makefile
+		grep '^#DEBUG=' GNUmakefile
+		[ "`(grep '^VERSION' Makefile; grep '^VERSION' GNUmakefile)| \
+			uniq -u`" = "" ]
+		tar -zc \
+			-s '/.*/${DISTDIR}\/\0/' \
+			-f ${DISTDIR}.tar.gz ${DISTFILES}
+
 lint:
 		lint -cehvx ${CFLAGS:M-D*} ${SRCS:M*.c}
 
diff --git a/TODO b/TODO
index 0bf42b5f..50d4e3e8 100644
--- a/TODO
+++ b/TODO
@@ -55,6 +55,7 @@
   is missing (like, eg, xterm-color in an aterm)
 - refer to windows by name etc (duplicates? fnmatch?)
 - commands:
+	start server
 	kill server
 	command to run something without a window at all?
 	command to insert a key into a window (send-key)
@@ -67,9 +68,6 @@
   some -s after, some no -s, there are various uses of -n. the differences are
   sort of logical, but confusing. needs rethought
 
--- For 0.1 --------------------------------------------------------------------
-- 
-
 -- For 0.2 --------------------------------------------------------------------
 - copy and paste
 - window splitting?