diff -Nurb FRANKLIN-506/ZimbraBuild/defs/coretargets.def FRANKLIN/ZimbraBuild/defs/coretargets.def
--- FRANKLIN-506/ZimbraBuild/defs/coretargets.def	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/defs/coretargets.def	2008-05-26 20:22:10.000000000 +0100
@@ -208,8 +208,12 @@
 
 pcre_UBUNTU6: ;
 
+pcre_UBUNTU8: ;
+
 pcre_UBUNTU6_64: ;
 
+pcre_UBUNTU8_64: ;
+
 pcre_SuSEES9: ;
 
 pcre_MANDRIVA2006: ;
@@ -271,7 +275,7 @@
 	cp -Rf $(SERVICE_DIR)/conf/externaldirsync $@/externaldirsync
 	cp -Rf $(SERVICE_DIR)/build/dist/conf/msgs $@/msgs
 	mkdir -p $@/spamassassin
-	cp $(SERVICE_DIR)/conf/spamassassin/[^C]* $@/spamassassin
+	cp $(SERVICE_DIR)/conf/spamassassin/* $@/spamassassin
 	mkdir -p $@/attrs
 	cp -f $(SERVICE_DIR)/build/dist/conf/attrs/* $@/attrs
 
diff -Nurb FRANKLIN-506/ZimbraBuild/defs/globals.def FRANKLIN/ZimbraBuild/defs/globals.def
--- FRANKLIN-506/ZimbraBuild/defs/globals.def	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/defs/globals.def	2008-05-26 20:22:10.000000000 +0100
@@ -36,6 +36,10 @@
 	ARCH := amd64
 endif
 
+ifeq ($(BUILD_PLATFORM), UBUNTU8_64)
+	ARCH := amd64
+endif
+
 ifeq ($(BUILD_PLATFORM), MACOSX)
 	ARCH := ppc
 endif
diff -Nurb FRANKLIN-506/ZimbraBuild/defs/UBUNTU8_64.def FRANKLIN/ZimbraBuild/defs/UBUNTU8_64.def
--- FRANKLIN-506/ZimbraBuild/defs/UBUNTU8_64.def	1970-01-01 01:00:00.000000000 +0100
+++ FRANKLIN/ZimbraBuild/defs/UBUNTU8_64.def	2008-05-26 20:22:10.000000000 +0100
@@ -0,0 +1,13 @@
+# Definitions for UBUNTU8_64
+
+PACKAGING_COMMAND := dpkg
+
+PACKAGING_OPTIONS = -b $(CUR_DEST_ROOT) $(PACKAGE_DIR)/$(CUR_PKG_NAME)
+
+PACKAGE_EXT := deb
+
+include $(DEFS_DIR)/plat_common.def
+
+JAVA_VERSION	:= 1.5.0_15
+JAVA_SOURCE	:= $(THIRD_PARTY_BUILDS)/x86_64/$(JAVA_DIR)/$(JAVA_FILE)$(JAVA_VERSION)
+JAVA_BINARY	:= /opt/zimbra/java/bin/java
diff -Nurb FRANKLIN-506/ZimbraBuild/defs/UBUNTU8.def FRANKLIN/ZimbraBuild/defs/UBUNTU8.def
--- FRANKLIN-506/ZimbraBuild/defs/UBUNTU8.def	1970-01-01 01:00:00.000000000 +0100
+++ FRANKLIN/ZimbraBuild/defs/UBUNTU8.def	2008-05-26 20:28:59.000000000 +0100
@@ -0,0 +1,9 @@
+# Definitions for UBUNTU8
+
+PACKAGING_COMMAND := dpkg
+
+PACKAGING_OPTIONS = -b $(CUR_DEST_ROOT) $(PACKAGE_DIR)/$(CUR_PKG_NAME)
+
+PACKAGE_EXT := deb
+
+include $(DEFS_DIR)/plat_common.def
diff -Nurb FRANKLIN-506/ZimbraBuild/rpmconf/Build/get_plat_tag.sh FRANKLIN/ZimbraBuild/rpmconf/Build/get_plat_tag.sh
--- FRANKLIN-506/ZimbraBuild/rpmconf/Build/get_plat_tag.sh	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/rpmconf/Build/get_plat_tag.sh	2008-05-26 20:22:11.000000000 +0100
@@ -157,6 +157,11 @@
 	if [ $? = 0 ]; then
 		echo "7${i}"
 		exit 0
+	fi
+	grep "DISTRIB_RELEASE=8" /etc/lsb-release > /dev/null 2>&1
+	if [ $? = 0 ]; then
+		echo "8${i}"
+		exit 0
 	else
 		echo "UNKNOWN"
 		exit 0
diff -Nurb FRANKLIN-506/ZimbraBuild/rpmconf/Install/Util/modules/packages.sh FRANKLIN/ZimbraBuild/rpmconf/Install/Util/modules/packages.sh
--- FRANKLIN-506/ZimbraBuild/rpmconf/Install/Util/modules/packages.sh	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/rpmconf/Install/Util/modules/packages.sh	2008-05-26 20:22:11.000000000 +0100
@@ -141,7 +141,7 @@
 		fi
 	done
 
-	if [ $PLATFORM = "DEBIAN3.1" -o $PLATFORM = "MANDRIVA2006" -o $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7" -o $PLATFORM = "DEBIAN4.0" ]; then
+	if [ $PLATFORM = "DEBIAN3.1" -o $PLATFORM = "MANDRIVA2006" -o $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7" -o $PLATFORM = "DEBIAN4.0" -o $PLATFORM = "UBUNTU8" -o $PLATFORM = "UBUNTU8_64" ]; then
 		LOCALPROC=$PROC
 	else
 		LOCALPROC=`uname -i`
diff -Nurb FRANKLIN-506/ZimbraBuild/rpmconf/Install/Util/utilfunc.sh FRANKLIN/ZimbraBuild/rpmconf/Install/Util/utilfunc.sh
--- FRANKLIN-506/ZimbraBuild/rpmconf/Install/Util/utilfunc.sh	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/rpmconf/Install/Util/utilfunc.sh	2008-05-26 20:22:12.000000000 +0100
@@ -279,7 +279,7 @@
     return
   fi
 
-  if [ "x$DISTRIB_ID" = "xUbuntu" -a "x$DISTRIB_RELEASE" != "x6.06" ]; then
+  if [ "x$DISTRIB_ID" = "xUbuntu" -a "x$DISTRIB_RELEASE" != "x6.06" -a "x$DISTRIB_RELEASE" != "x8.04" ]; then
     echo "WARNING: ZCS is currently only supported on Ubuntu Server 6.06 LTS."
     echo "You are attempting to install on $DISTRIB_DESCRIPTION which may not work."
     echo "Support will not be provided if you choose to continue."
@@ -1648,7 +1648,7 @@
 
 getPlatformVars() {
   PLATFORM=`bin/get_plat_tag.sh`
-  if [ $PLATFORM = "DEBIAN3.1" -o $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU7" -o $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7_64" -o $PLATFORM = "DEBIAN4.0" -o $PLATFORM = "DEBIAN4.0_64" -o $PLATFORM = "UBUNTUUNKNOWN" -o $PLATFORM = "DEBIANUNKNOWN" ]; then
+  if [ $PLATFORM = "DEBIAN3.1" -o $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU7" -o $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7_64" -o $PLATFORM = "UBUNTU8_64" -o $PLATFORM = "UBUNTU8" -o $PLATFORM = "DEBIAN4.0" -o $PLATFORM = "DEBIAN4.0_64" -o $PLATFORM = "UBUNTUUNKNOWN" -o $PLATFORM = "DEBIANUNKNOWN" ]; then
     checkUbuntuRelease
     PACKAGEINST='dpkg -i'
     PACKAGERM='dpkg --purge'
@@ -1656,14 +1656,17 @@
     PACKAGEEXT='deb'
     PACKAGEVERSION="dpkg-query -W -f \${Version}"
     PREREQ_PACKAGES="sudo libidn11 fetchmail libgmp3 libxml2 libstdc++6 openssl libltdl3"
-    if [ $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU7" ]; then
+    if [ $PLATFORM = "UBUNTU6" -o $PLATFORM = "UBUNTU7" -o $PLATFORM = "UBUNTU8" ]; then
       PREREQ_PACKAGES="sudo libidn11 fetchmail libpcre3 libgmp3c2 libexpat1 libxml2 libstdc++6 libstdc++5 openssl libltdl3"
       PRESUG_PACKAGES="perl-5.8.7"
     fi
-    if [ $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7_64" ]; then
+    if [ $PLATFORM = "UBUNTU6_64" -o $PLATFORM = "UBUNTU7_64" -o $PLATFORM = "UBUNTU8_64" ]; then
       PREREQ_PACKAGES="sudo libidn11 fetchmail libpcre3 libgmp3c2 libexpat1 libxml2 libstdc++6 libstdc++5 openssl libltdl3 libperl5.8"
       PRESUG_PACKAGES="perl-5.8.7"
     fi
+    if [ $PLATFORM = "UBUNTU8_64" -o $PLATFORM = "UBUNTU8" ]; then
+	PRESUG_PACKAGES="perl-5.8.8"
+    fi
     if [ $PLATFORM = "DEBIAN4.0" -o $PLATFORM = "DEBIAN4.0_64" ]; then
       PREREQ_PACKAGES="sudo libidn11 fetchmail libpcre3 libgmp3c2 libexpat1 libxml2 libstdc++6 openssl libltdl3"
       PRESUG_PACKAGES="perl-5.8.8"
diff -Nurb FRANKLIN-506/ZimbraBuild/rpmconf/Install/zmsetup.pl FRANKLIN/ZimbraBuild/rpmconf/Install/zmsetup.pl
--- FRANKLIN-506/ZimbraBuild/rpmconf/Install/zmsetup.pl	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/rpmconf/Install/zmsetup.pl	2008-05-26 20:22:13.000000000 +0100
@@ -561,7 +561,7 @@
   my $pkgQuery;
 
   my $good = 0;
-  if ($platform eq "DEBIAN3.1" || $platform eq "UBUNTU6" || $platform eq "UBUNTU7" || $platform eq "UBUNTUUNKNOWN" || $platform eq "DEBIAN4.0" || $platform eq "DEBIAN4.0_64" || $platform eq "UBUNTU6_64" || $platform eq "DEBIANUNKNOWN" ) {
+  if ($platform eq "DEBIAN3.1" || $platform eq "UBUNTU6" || $platform eq "UBUNTU7" || $platform eq "UBUNTUUNKNOWN" || $platform eq "DEBIAN4.0" || $platform eq "DEBIAN4.0_64" || $platform eq "UBUNTU6_64" || $platform eq "DEBIANUNKNOWN" || $platform eq "UBUNTU8" || $platform eq "UBUNTU8_64" ) {
     $pkgQuery = "dpkg -s $pkg";
   } elsif ($platform =~ /MACOSX/) {
     my @l = sort glob ("/Library/Receipts/${pkg}*");
@@ -575,7 +575,7 @@
 
   my $rc = 0xffff & system ("$pkgQuery > /dev/null 2>&1");
   $rc >>= 8;
-  if (($platform eq "DEBIAN3.1" || $platform eq "UBUNTU6" || $platform eq "UBUNTU7" || $platform eq "UBUNTUUNKNOWN" || $platform eq "DEBIAN4.0" || $platform eq "DEBIAN4.0_64" || $platform eq "UBUNTU6_64" || $platform eq "DEBIANUNKNOWN" ) && $rc == 0 ) {
+  if (($platform eq "DEBIAN3.1" || $platform eq "UBUNTU6" || $platform eq "UBUNTU7" || $platform eq "UBUNTUUNKNOWN" || $platform eq "DEBIAN4.0" || $platform eq "DEBIAN4.0_64" || $platform eq "UBUNTU6_64" || $platform eq "DEBIANUNKNOWN" || $platform eq "UBUNTU8" || $platform eq "UBUNTU8_64" ) && $rc == 0 ) {
     $good = 1;
     $pkgQuery = "dpkg -s $pkg | egrep '^Status: ' | grep 'not-installed'";
     $rc = 0xffff & system ("$pkgQuery > /dev/null 2>&1");
diff -Nurb FRANKLIN-506/ZimbraBuild/rpmconf/Spec/Scripts/zimbracore.post FRANKLIN/ZimbraBuild/rpmconf/Spec/Scripts/zimbracore.post
--- FRANKLIN-506/ZimbraBuild/rpmconf/Spec/Scripts/zimbracore.post	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraBuild/rpmconf/Spec/Scripts/zimbracore.post	2008-05-26 20:22:14.000000000 +0100
@@ -73,7 +73,7 @@
   sed -i -e 's:\(^Defaults.*requiretty\):#\1:' /etc/sudoers
 fi
 
-if [ x"$PLAT" = "xUBUNTU6" -o x"$PLAT" = "xUBUNTU6_64" -o x"$PLAT" = "xDEBIAN4.0" -o x"$PLAT" = "xDEBIAN4.0_64" ]; then
+if [ x"$PLAT" = "xUBUNTU6" -o x"$PLAT" = "xUBUNTU6_64" -o x"$PLAT" = "xUBUNTU8" -o x"$PLAT" = "xUBUNTU8_64" -o x"$PLAT" = "xDEBIAN4.0" -o x"$PLAT" = "xDEBIAN4.0_64" ]; then
   sed -i -e 's/# session    required   pam_limits.so/session    required   pam_limits.so/' /etc/pam.d/su
   egrep -v -e '^session	required	pam_limits.so' /etc/pam.d/common-session >/tmp/common-session
   echo "session	required	pam_limits.so" >> /tmp/common-session
diff -Nurb FRANKLIN-506/ZimbraServer/src/bin/zmsyslogsetup FRANKLIN/ZimbraServer/src/bin/zmsyslogsetup
--- FRANKLIN-506/ZimbraServer/src/bin/zmsyslogsetup	2008-05-23 03:31:05.000000000 +0100
+++ FRANKLIN/ZimbraServer/src/bin/zmsyslogsetup	2008-05-26 20:22:14.000000000 +0100
@@ -105,7 +105,7 @@
 
 cp -f /tmp/syslog.zimbra2 /etc/syslog.conf
 
-if [ x"$platform" = "xUBUNTU6" -o x"$platform" = "xUBUNTU6_64" -o x"$platform" = "xDEBIAN4.0" ]; then
+if [ x"$platform" = "xUBUNTU6" -o x"$platform" = "xUBUNTU6_64" -o x"$platform" = "xDEBIAN4.0" -o x"$platform" = "xUBUNTU8" -o x"$platform" = "xUBUNTU8_64" ]; then
   if [ -e "/etc/init.d/sysklogd" ]; then
     /etc/init.d/sysklogd restart > /dev/null 2>&1 
   else