--- Makefile.am.orig	Wed Sep 26 06:59:56 2001
+++ Makefile.am	Sat Feb 14 10:40:49 2009
@@ -1,5 +1,5 @@
-sbin_PROGRAMS=opennap metaserver setup #mkpass
-opennap_SOURCES=opennap.h main.c add_file.c search.c \
+sbin_PROGRAMS=opennap metaserver setup
+opennap_SOURCES=opennap.h main.c add_file.c discipline.c search.c \
 	motd.c hash.h hash.c privmsg.c browse.c \
 	debug.c debug.h login.c whois.c free_user.c \
 	join.c part.c public.c part_channel.c \
@@ -14,17 +14,16 @@ opennap_SOURCES=opennap.h main.c add_file.c search.c \
 	napigator.c win32-support.h #fast_snprintf.c
 opennap_LDADD=$(REGEX)
 opennap_DEPENDENCIES=$(REGEX)
-#mkpass_SOURCES=mkpass.c md5.c debug.c util.c
 metaserver_SOURCES=metaserver.c
 setup_SOURCES=setup.c
 EXTRA_opennap_SOURCES=regex.c _regex.h
 EXTRA_DIST=sample.config sample.motd napster.txt .indent.pro \
 	FAQ spyserv.c opennap.dsw opennap.dsp \
 	opennap.opt sample.users sample.servers opennap.spec \
-	getopt.c mkpass.dsp sample.channels \
-	napchk logchk setup.dsp opennap.init sample.filter mkpass.c \
+	getopt.c sample.channels \
+	napchk logchk setup.dsp opennap.init sample.filter \
 	manual.html start_opennap sample.block win98se_max_conn.reg \
-	notes.txt sample.block
+	notes.txt sample.block metaserver.dsp
 INCLUDES=-DSHAREDIR=\"@SHAREDIR@\"
 
 .PHONY: log
