--- Makefile.concept.orig	2003-10-20 23:35:32.000000000 +0100
+++ Makefile.concept	2003-10-23 19:11:03.000000000 +0100
@@ -19,6 +19,8 @@
 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,7 +38,7 @@
 
 .PHONY: clean install
 
-all: smtp pop3d maintenance imapd user 
+all: smtp pop3d maintenance imapd user
 
 smtp: dbmail.h main.h $(SMTP_OBJECTS) main.c
 		$(CC)	$(CFLAGS) main.c -o dbmail-smtp $(SMTP_OBJECTS) $(DIRS) $(LIB)
@@ -47,6 +49,9 @@
 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)