--- a/src/master/Makefile.am	Thu Apr 23 14:07:45 2009 -0400
+++ b/src/master/Makefile.am	Thu Apr 23 19:53:44 2009 -0400
@@ -1,7 +1,7 @@
 pkglibexecdir = $(libexecdir)/dovecot
 
 sbin_PROGRAMS = dovecot
-pkglibexec_PROGRAMS = ssl-build-param
+#pkglibexec_PROGRAMS = ssl-build-param
 
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/src/lib \
@@ -11,52 +11,37 @@
 	-DPKG_RUNDIR=\""$(rundir)"\" \
 	-DPKG_STATEDIR=\""$(statedir)"\" \
 	-DPKG_LIBEXECDIR=\""$(pkglibexecdir)"\" \
-	-DBINDIR=\""$(bindir)"\" \
-	-DSSLDIR=\""$(ssldir)\""
+	-DBINDIR=\""$(bindir)"\"
 
-dovecot_LDADD = \
+libs = \
 	$(LIBCAP) \
 	$(LIBDOVECOT)
 
+dovecot_LDADD = $(libs)
+dovecot_DEPENDENCIES = $(libs)
+
 dovecot_SOURCES = \
-	auth-process.c \
-	askpass.c \
 	capabilities-posix.c \
-	child-process.c \
-	dict-process.c \
 	dup2-array.c \
-	listener.c \
-	log.c \
-	login-process.c \
-	mail-process.c \
+	main.c \
 	master-settings.c \
-	main.c \
-	ssl-init.c \
-	sysinfo-get.c
+	service-auth-server.c \
+	service-auth-source.c \
+	service-listen.c \
+	service-log.c \
+	service-monitor.c \
+	service-process.c \
+	service.c
 
 noinst_HEADERS = \
-	auth-process.h \
-	askpass.h \
 	capabilities.h \
-	child-process.h \
-	dict-process.h \
+	common.h \
 	dup2-array.h \
-	listener.h \
-	common.h \
-	log.h \
-	login-process.h \
-	mail-process.h \
-	master-login-interface.h \
 	master-settings.h \
-	ssl-init.h \
-	sysinfo-get.h
-
-ssl_build_param_SOURCES = \
-	ssl-init-main.c \
-	ssl-init-openssl.c \
-	ssl-init-gnutls.c
-
-ssl_build_param_LDADD = \
-	$(LIBDOVECOT) \
-	$(SSL_LIBS)
-ssl_build_param_DEPENDENCIES = $(LIBDOVECOT)
+	service-auth-server.h \
+	service-auth-source.h \
+	service-listen.h \
+	service-log.h \
+	service-monitor.h \
+	service-process.h \
+	service.h