diff --git a/TODO b/TODO
index 23ee023..66660a6 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 take a look at DB's smtp patch
 
-optmize aux_getgroupudata
+optmize aux_getgroupudata (Mike idea)
     make aux_newclass receive upvalues
     use one upvalue per string name of class/group
     make aux_checkgroup by upvalue (faster)
diff --git a/etc/README b/etc/README
index c459a46..e72471d 100644
--- a/etc/README
+++ b/etc/README
@@ -20,6 +20,13 @@ converted into a library, similar to the HTTP  and FTP libraries, that can
 be used from within  any luasocket application. Take  a look on the  source
 code and you will be able to figure out how to use it.
 
+    lp.lua                  -- LPD client
+
+The lp.lua module implements the client part of the Line Printer Daemon
+protocol, used to print files on Unix machines. It is courtesy of David
+Burgess and I heard he would be the one supporting it, even after I messed
+with it.  See the source code and the lpr.lua in the examples directory.
+
     get.lua                 -- file retriever
 
 This little  program is  a client  that uses  the FTP  and HTTP  code to
diff --git a/makefile.dist b/makefile.dist
index fec6579..56bba96 100644
--- a/makefile.dist
+++ b/makefile.dist
@@ -29,7 +29,7 @@ EXAMPLES = \
 	eol.lua \
 	listener.lua \
 	qp.lua \
-	lp.lua \
+	lpr.lua \
 	talker.lua \
 	tinyirc.lua
 
@@ -38,6 +38,9 @@ ETC = \
 	dict.lua \
 	get.lua \
 	lua.lua \
+	unix.c \
+	unix.h \
+	lp.lua \
 	tftp.lua
 
 CORE = \
@@ -74,8 +77,6 @@ CORE = \
 MAKE = \
 	makefile.Darwin \
 	makefile.Linux \
-	luasocket.export \
-	mime.export \
 	luasocket.sln \
 	luasocket.vcproj \
 	mime.vcproj
@@ -103,6 +104,8 @@ dist:
 	mkdir -p $(DIST)/etc
 	mkdir -p $(DIST)/lua
 	mkdir -p $(DIST)/manual
+	cp -vf FIX $(DIST)
+	cp -vf TODO $(DIST)
 	cp -vf $(CORE) $(DIST)
 	cp -vf README $(DIST)
 	cp -vf NEW $(DIST)
diff --git a/samples/README b/samples/README
index 6e7ee77..3ce4067 100644
--- a/samples/README
+++ b/samples/README
@@ -19,11 +19,12 @@ printed by listen.lua.
 These are tiny programs that perform Base64, Quoted-Printable and
 end-of-line marker conversions.
 
-    lp.lua                  -- lp client
+    lpr.lua                 -- lpr client
 
 This is a cool program written by David Burgess to print files using the
-Line Printer Daemon protocol, widely used in Unix machines.  
-Just run 'lua lp.lua <filename> queue=<printername>' and the file will print!
+Line Printer Daemon protocol, widely used in Unix machines.  It uses the
+lp.lua implementation, in the etc directory.  Just run 
+'lua lpr.lua <filename> queue=<printername>' and the file will print!
 
     cddb.lua                -- CDDB client