--- Makefile.concept.orig	2003-10-20 23:35:32.000000000 +0100
+++ Makefile.concept	2003-10-23 18:32:53.000000000 +0100
@@ -16,9 +16,12 @@
 INJECTOR_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o
 UNIONE_OBJECTS = list.o debug.o $(DBOBJECT) dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o
 MINI_OBJECTS = debug.o $(DBOBJECT) list.o dbmd5.o md5.o $(AUTHOBJECT) mime.o config.o
+IPOP_OBJECTS = ipop3.o list.o debug.o $(DBOBJECT) serverchild.o server.o dbmd5.o md5.o mime.o misc.o memblock.o $(AUTHOBJECT) config.o proctitleutils.o
 POP_OBJECTS = pop3.o list.o debug.o $(DBOBJECT) serverchild.o server.o dbmd5.o md5.o mime.o misc.o memblock.o $(AUTHOBJECT) config.o proctitleutils.o
 IMAP_OBJECTS = imap4.o debug.o $(DBOBJECT) serverchild.o server.o config.o list.o dbmd5.o md5.o imaputil.o \
 imapcommands.o mime.o misc.o memblock.o rfcmsg.o $(MSGBUFOBJECT) $(SEARCHOBJECT) $(AUTHOBJECT) quota.o proctitleutils.o
+XIMAP_OBJECTS = ximap4.o debug.o $(DBOBJECT) serverchild.o server.o config.o list.o dbmd5.o md5.o imaputil.o \
+imapcommands.o mime.o misc.o memblock.o rfcmsg.o $(MSGBUFOBJECT) $(SEARCHOBJECT) $(AUTHOBJECT) quota.o proctitleutils.o
 MAINTENANCE_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT) config.o
 CONFIG_OBJECTS = $(DBOBJECT) list.o md5.o debug.o dbmd5.o mime.o memblock.o $(AUTHOBJECT) config.o
 USER_OBJECTS = debug.o list.o dbmd5.o md5.o $(DBOBJECT) mime.o memblock.o $(AUTHOBJECT) config.o
@@ -36,17 +39,23 @@
 
 .PHONY: clean install
 
-all: smtp pop3d maintenance imapd user 
+all: smtp pop3d maintenance imapd user ipop3d
 
 smtp: dbmail.h main.h $(SMTP_OBJECTS) main.c
 		$(CC)	$(CFLAGS) main.c -o dbmail-smtp $(SMTP_OBJECTS) $(DIRS) $(LIB)
 
+ipop3d: pop3.h $(POP_OBJECTS) ipop3d.c
+                $(CC) $(CFLAGS) ipop3d.c -o dbmail-ipop3d $(POP_OBJECTS) $(DIRS) $(LIB)
+
 pop3d: pop3.h $(POP_OBJECTS) pop3d.c
 		$(CC) $(CFLAGS) pop3d.c -o dbmail-pop3d $(POP_OBJECTS) $(DIRS) $(LIB)
 
 imapd: imap4.h $(IMAP_OBJECTS) imapd.c
 	$(CC) $(CFLAGS) imapd.c -o dbmail-imapd $(IMAP_OBJECTS) $(DIRS) $(LIB)
 
+ximapd: imap4.h $(XIMAP_OBJECTS) ximapd.c
+	$(CC) $(CFLAGS) ximapd.c -o dbmail-ximapd $(XIMAP_OBJECTS) $(DIRS) $(LIB)
+
 maintenance: maintenance.h $(MAINTENANCE_OBJECTS) maintenance.c
 	$(CC) $(CFLAGS) maintenance.c -o dbmail-maintenance $(MAINTENANCE_OBJECTS) $(DIRS) $(LIB)
 
@@ -106,7 +115,7 @@
 	     $(CC) -o $(AUTHOBJECT) -c $(AUTHSOURCE) $(DIRS)
 
 distclean: clean
-	rm -rf dbmail-smtp dbmail-pop3d dbmail-maintenance dbmail-imapd dbmail-config dbmail-adduser dbmail-readvut mbox2dbmail dbmail-realsmtp
+	rm -rf dbmail-smtp dbmail-pop3d dbmail-maintenance dbmail-imapd dbmail-config dbmail-adduser dbmail-readvut mbox2dbmail dbmail-realsmtp dbmail-ipop3d
 
 clean:
 	rm -f *.o core $(__DBTYPE__)/*.o