diff -ur open-xchange.0.7.0.orig/Makefile.am open-xchange.0.7.0/Makefile.am
--- open-xchange.0.7.0.orig/Makefile.am	2004-08-19 06:40:57.000000000 -0700
+++ open-xchange.0.7.0/Makefile.am	2004-09-02 11:24:03.091589784 -0700
@@ -3,7 +3,7 @@
 	@ANT@ clean
 
 misc:
-	rm src/misc/ssl/com_openchange_ssl_SSLServerSocket.h
+	rm src/misc/ssl/com_openexchange_ssl_SSLServerSocket.h
 	rm src/misc/ssl/com_openexchange_ssl_SSLCtx.h
 	rm src/misc/ssl/com_openexchange_ssl_SSLInputStream.h
 	rm src/misc/ssl/com_openexchange_ssl_SSLOutputStream.h
@@ -11,33 +11,33 @@
 	rm src/misc/ssl/com_openexchange_ssl_SSLSocket.h
 
 install:
-	$(mkinstalldirs) @bindir@
-	$(mkinstalldirs) @sbindir@
-	$(mkinstalldirs) @datadir@
-	$(mkinstalldirs) @datadir@/images
-	$(mkinstalldirs) @datadir@/sound
-	$(mkinstalldirs) @datadir@/misc
-	$(mkinstalldirs) @datadir@/servlets
-	$(mkinstalldirs) @datadir@/perl
-	$(mkinstalldirs) @oxgroupwarehtmldir@
-	$(mkinstalldirs) @oxwebmailhtmldir@
-	$(mkinstalldirs) @sysconfdir@
-	$(mkinstalldirs) @sysconfdir@/groupware
-	$(mkinstalldirs) @sysconfdir@/webmail
-	$(mkinstalldirs) @sysconfdir@/init.d
-	$(mkinstalldirs) @sysconfdir@/groupware/CERT
-	$(mkinstalldirs) @localstatedir@
-	$(mkinstalldirs) @localstatedir@/log
-	$(mkinstalldirs) @localstatedir@/settings/intranet
-	$(mkinstalldirs) @localstatedir@/settings/webmail
-	$(mkinstalldirs) @localstatedir@/filespool
-	$(mkinstalldirs) @localstatedir@/drafts
-	$(mkinstalldirs) @localstatedir@/webmailupload
-	$(mkinstalldirs) @localstatedir@/dictionary
-	$(mkinstalldirs) @libdir@
-	$(mkinstalldirs) @includedir@
-	$(mkinstalldirs) @infodir@
-	$(mkinstalldirs) @mandir@
+	$(mkinstalldirs) ${D}/@bindir@
+	$(mkinstalldirs) ${D}/@sbindir@
+	$(mkinstalldirs) ${D}/@datadir@
+	$(mkinstalldirs) ${D}/@datadir@/images
+	$(mkinstalldirs) ${D}/@datadir@/sound
+	$(mkinstalldirs) ${D}/@datadir@/misc
+	$(mkinstalldirs) ${D}/@datadir@/servlets
+	$(mkinstalldirs) ${D}/@datadir@/perl
+	$(mkinstalldirs) ${D}/@oxgroupwarehtmldir@
+	$(mkinstalldirs) ${D}/@oxwebmailhtmldir@
+	$(mkinstalldirs) ${D}/@sysconfdir@
+	$(mkinstalldirs) ${D}/@sysconfdir@/groupware
+	$(mkinstalldirs) ${D}/@sysconfdir@/webmail
+	$(mkinstalldirs) ${D}/@sysconfdir@/init.d
+	$(mkinstalldirs) ${D}/@sysconfdir@/groupware/CERT
+	$(mkinstalldirs) ${D}/@localstatedir@
+	$(mkinstalldirs) ${D}/@localstatedir@/log
+	$(mkinstalldirs) ${D}/@localstatedir@/settings/intranet
+	$(mkinstalldirs) ${D}/@localstatedir@/settings/webmail
+	$(mkinstalldirs) ${D}/@localstatedir@/filespool
+	$(mkinstalldirs) ${D}/@localstatedir@/drafts
+	$(mkinstalldirs) ${D}/@localstatedir@/webmailupload
+	$(mkinstalldirs) ${D}/@localstatedir@/dictionary
+	$(mkinstalldirs) ${D}/@libdir@
+	$(mkinstalldirs) ${D}/@includedir@
+	$(mkinstalldirs) ${D}/@infodir@
+	$(mkinstalldirs) ${D}/@mandir@
 	chmod 755 bin/groupware/openexchange-groupware
 	chmod 755 bin/groupware/openexchange-sessiond
 	chmod 755 bin/webmail/openexchange-webmail
@@ -61,63 +61,62 @@
 	chmod 755 system/etc/init.d/webmail
 	chmod 755 system/etc/init.d/sessiond
 	chmod 755 system/etc/init.d/openexchange
-	chown -R @runuid@.nogroup @localstatedir@
-	cp bin/groupware/openexchange-groupware @bindir@/.
-	cp bin/groupware/openexchange-sessiond @bindir@/.
-	cp bin/webmail/openexchange-webmail @bindir@/.
-	cp sbin/addgroup_ox @sbindir@/.
-	cp sbin/addresource_ox @sbindir@/.
-	cp sbin/addresourcegroup_ox @sbindir@/.
-	cp sbin/addresourcetogroup_ox @sbindir@/.
-	cp sbin/adduser_ox @sbindir@/.
-	cp sbin/addusersql_ox @sbindir@/.
-	cp sbin/addusertogroup_ox @sbindir@/.
-	cp sbin/changeuserattr_ox @sbindir@/.
-	cp sbin/delgroup_ox @sbindir@/.
-	cp sbin/delresource_ox @sbindir@/.
-	cp sbin/delresourcefromgroup_ox @sbindir@/.
-	cp sbin/delresourcegroup_ox @sbindir@/.
-	cp sbin/deluser_ox @sbindir@/.
-	cp sbin/deluserfromgroup_ox @sbindir@/.
-	cp sbin/correctfilespool @sbindir@/.
-	cp -r system/setup/* @datadir@/.
-	cp -r system/etc/cron.d/ @sysconfdir@/.
-	cp system/etc/init.d/groupware @sysconfdir@/init.d/.
-	cp system/etc/init.d/sessiond @sysconfdir@/init.d/.
-	cp system/etc/init.d/webmail @sysconfdir@/init.d/.
-	cp system/etc/init.d/openexchange @sysconfdir@/init.d/.
-	cp conf/admintools.conf @sysconfdir@/.
-	cp conf/initscript.conf @sysconfdir@/.
-	cp conf/groupware/nasi.conf @sysconfdir@/groupware/.
-	cp conf/groupware/calendar @sysconfdir@/groupware/.
-	cp conf/groupware/currencyformat @sysconfdir@/groupware/.
-	cp conf/groupware/dateformat @sysconfdir@/groupware/.
-	cp conf/groupware/external.conf @sysconfdir@/groupware/.
-	cp conf/groupware/forum @sysconfdir@/groupware/.
-	cp conf/groupware/intranet.conf @sysconfdir@/groupware/.
-	cp conf/groupware/ldap.properties @sysconfdir@/groupware/.
-	cp conf/groupware/server.conf @sysconfdir@/groupware/.
-	cp conf/groupware/system.properties @sysconfdir@/groupware/.
-	cp conf/groupware/tasks @sysconfdir@/groupware/.
-	cp -r conf/groupware/locales @sysconfdir@/groupware/.
-	cp -r conf/groupware/METADB @sysconfdir@/groupware/.
-	cp conf/webmail/flags.cfg @oxwebmailsysconfdir@/.
-	cp conf/webmail/system.properties @oxwebmailsysconfdir@/.
-	cp conf/webmail/nasi.conf @oxwebmailsysconfdir@/.
-	cp conf/webmail/server.conf @oxwebmailsysconfdir@/.
-	cp conf/webmail/spellcheck.cfg @oxwebmailsysconfdir@/.
-	cp conf/webmail/system.cfg @oxwebmailsysconfdir@/.
-	cp conf/webmail/system.properties @oxwebmailsysconfdir@/.
-	cp -r conf/webmail/locales @oxwebmailsysconfdir@/.
-	cp -r groupware/* @oxgroupwarehtmldir@/.
-	cp -r webmail/* @oxwebmailhtmldir@/.
-	cp -r system/www/groupware/* @datadir@/groupware/data/.
-	cp -r system/www/webmail/* @datadir@/webmail/data/.
-	cp lib/* @libdir@/
-	if test -f src/misc/ssl/.libs/liboxssl.so ; then cp src/misc/ssl/.libs/liboxssl.so @libdir@/. ; fi
+	cp bin/groupware/openexchange-groupware ${D}/@bindir@/.
+	cp bin/groupware/openexchange-sessiond ${D}/@bindir@/.
+	cp bin/webmail/openexchange-webmail ${D}/@bindir@/.
+	cp sbin/addgroup_ox ${D}/@sbindir@/.
+	cp sbin/addresource_ox ${D}/@sbindir@/.
+	cp sbin/addresourcegroup_ox ${D}/@sbindir@/.
+	cp sbin/addresourcetogroup_ox ${D}/@sbindir@/.
+	cp sbin/adduser_ox ${D}/@sbindir@/.
+	cp sbin/addusersql_ox ${D}/@sbindir@/.
+	cp sbin/addusertogroup_ox ${D}/@sbindir@/.
+	cp sbin/changeuserattr_ox ${D}/@sbindir@/.
+	cp sbin/delgroup_ox ${D}/@sbindir@/.
+	cp sbin/delresource_ox ${D}/@sbindir@/.
+	cp sbin/delresourcefromgroup_ox ${D}/@sbindir@/.
+	cp sbin/delresourcegroup_ox ${D}/@sbindir@/.
+	cp sbin/deluser_ox ${D}/@sbindir@/.
+	cp sbin/deluserfromgroup_ox ${D}/@sbindir@/.
+	cp sbin/correctfilespool ${D}/@sbindir@/.
+	cp -r system/setup/* ${D}/@datadir@/.
+	cp -r system/etc/cron.d/ ${D}/@sysconfdir@/.
+	cp system/etc/init.d/groupware ${D}/@sysconfdir@/init.d/.
+	cp system/etc/init.d/sessiond ${D}/@sysconfdir@/init.d/.
+	cp system/etc/init.d/webmail ${D}/@sysconfdir@/init.d/.
+	cp system/etc/init.d/openexchange ${D}/@sysconfdir@/init.d/.
+	cp conf/admintools.conf ${D}/@sysconfdir@/.
+	cp conf/initscript.conf ${D}/@sysconfdir@/.
+	cp conf/groupware/nasi.conf ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/calendar ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/currencyformat ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/dateformat ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/external.conf ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/forum ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/intranet.conf ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/ldap.properties ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/server.conf ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/system.properties ${D}/@sysconfdir@/groupware/.
+	cp conf/groupware/tasks ${D}/@sysconfdir@/groupware/.
+	cp -r conf/groupware/locales ${D}/@sysconfdir@/groupware/.
+	cp -r conf/groupware/METADB ${D}/@sysconfdir@/groupware/.
+	cp conf/webmail/flags.cfg ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/system.properties ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/nasi.conf ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/server.conf ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/spellcheck.cfg ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/system.cfg ${D}/@oxwebmailsysconfdir@/.
+	cp conf/webmail/system.properties ${D}/@oxwebmailsysconfdir@/.
+	cp -r conf/webmail/locales ${D}/@oxwebmailsysconfdir@/.
+	cp -r groupware/* ${D}/@oxgroupwarehtmldir@/.
+	cp -r webmail/* ${D}/@oxwebmailhtmldir@/.
+	cp -r system/www/groupware/* ${D}/@datadir@/groupware/data/.
+	cp -r system/www/webmail/* ${D}/@datadir@/webmail/data/.
+	cp lib/* ${D}/@libdir@/
+	if test -f src/misc/ssl/.libs/liboxssl.so ; then cp src/misc/ssl/.libs/liboxssl.so ${D}/@libdir@/. ; fi
 	chmod 755 src/misc/login/login.pl
-	cp src/misc/login/login.pl @datadir@/perl/.	
-	cp src/misc/login/login.pm @datadir@/perl/.	
-	cp build/intranet.class @datadir@/servlets/.	
-	cp build/webmail.class @datadir@/servlets/.	
+	cp src/misc/login/login.pl ${D}/@datadir@/perl/.	
+	cp src/misc/login/login.pm ${D}/@datadir@/perl/.	
+	cp build/intranet.class ${D}/@datadir@/servlets/.	
+	cp build/webmail.class ${D}/@datadir@/servlets/.