diff -ruN up-imapproxy-1.2.4rc2/Makefile.in up-imapproxy-1.2.4rc2-patched/Makefile.in
--- up-imapproxy-1.2.4rc2/Makefile.in	Wed Jul  6 05:18:06 2005
+++ up-imapproxy-1.2.4rc2-patched/Makefile.in	Thu Jul 28 13:52:59 2005
@@ -79,20 +79,20 @@
 
 install: $(XYD_BIN) $(TAT_BIN)
 	mkdir -p $(EBIN)
-	$(INSTALL) -o bin -g bin -m 0755 $(XYD_BIN) $(EBIN)
-	$(INSTALL) -o bin -g bin -m 0755 $(TAT_BIN) $(EBIN)
+	$(INSTALL) -o daemon -g daemon -m 0755 $(XYD_BIN) $(EBIN)
+	$(INSTALL) -o daemon -g daemon -m 0755 $(TAT_BIN) $(EBIN)
 
 install-init:
-	$(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.init $(ETC)/init.d/imapproxy
+	$(INSTALL) -o root -g admin -m 0755 ./scripts/imapproxy.init $(ETC)/init.d/imapproxy
 	ln -s ../init.d/imapproxy /etc/rc2.d/S99imapproxy
 	ln -s ../init.d/imapproxy /etc/rc0.d/K10imapproxy
 
 install-conf:
-	$(INSTALL) -o root -g bin -m 0755 ./scripts/imapproxy.conf $(ETC)
+	$(INSTALL) -o root -g admin -m 0755 ./scripts/imapproxy.conf $(ETC)
 
 rpm-install: install 
-	$(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.conf $(rpm_prefix)/etc
-	$(INSTALL) -o root -g sys -m 0755 ./scripts/imapproxy.init $(rpm_prefix)/etc/init.d/imapproxy
+	$(INSTALL) -o root -g admin -m 0755 ./scripts/imapproxy.conf $(rpm_prefix)/etc
+	$(INSTALL) -o root -g admin -m 0755 ./scripts/imapproxy.init $(rpm_prefix)/etc/init.d/imapproxy
 
 pkg:
 	pkgmk -o -r .
diff -ruN up-imapproxy-1.2.4rc2/config.h.in up-imapproxy-1.2.4rc2-patched/config.h.in
--- up-imapproxy-1.2.4rc2/config.h.in	Wed Jul  6 05:18:09 2005
+++ up-imapproxy-1.2.4rc2-patched/config.h.in	Thu Jul 28 13:51:31 2005
@@ -90,6 +90,7 @@
 #undef const
 
 #if HAVE_SYS_MMAN_H
+#include <sys/types.h>
 #include <sys/mman.h>
 #endif