diff -urN ooo_SRC680_m196_src.orig/config_office/configure.in ooo_SRC680_m196_src/config_office/configure.in
--- ooo_SRC680_m196_src.orig/config_office/configure.in	2006-12-06 15:00:33.000000000 +0100
+++ ooo_SRC680_m196_src/config_office/configure.in	2006-12-06 15:01:45.000000000 +0100
@@ -19,6 +19,10 @@
 AC_ARG_WITH(gnu-patch,
 [  --with-gnu-patch        Specify location of GNU patch on Solaris or FreeBSD
 ],,)
+AC_ARG_ENABLE(universal,
+[  --enable-universal      Enable building of 'Universal Binaries' instead of
+                           native ones on Mac OS X
+],,enable_universal=no)
 AC_ARG_WITH(agg,
 [  --without-agg           Disable the use of agg altogether
 ],,with_agg=yes)
@@ -614,6 +618,18 @@
    CygwinVer="false"
 fi
 
+#if echo "$build_os" | grep -q darwin; then
+   AC_MSG_CHECKING([which Mac OS X binaries should be built])
+   if test "$enable_universal" = "yes"; then
+      AC_MSG_RESULT([universal])
+      UNIVERSAL_BINARIES=YES
+   else
+      AC_MSG_RESULT([native ($build_cpu)])
+      UNIVERSAL_BINARIES=NO
+   fi
+#fi
+AC_SUBST(UNIVERSAL_BINARIES)
+
 dnl ===================================================================
 dnl The following is a list of supported systems.
 dnl Sequential to keep the logic very simple
diff -urN ooo_SRC680_m223_src.orig/config_office/set_soenv.in ooo_SRC680_m223_src/config_office/set_soenv.in
--- ooo_SRC680_m223_src.orig/config_office/set_soenv.in	2007-07-30 17:36:55.000000000 +0200
+++ ooo_SRC680_m223_src/config_office/set_soenv.in	2007-07-30 17:39:49.000000000 +0200
@@ -57,7 +57,7 @@
      $BUILD_SOSL_RELEASE, $RSC_ONCE );
 #
 # Platform dependent constant values.
-my ( $BIG_SVX, $COM, $CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, $GUIENV,
+my ( $BIG_SVX, $COM, $CPU, $NATIVE_CPU, $CPUNAME, $CVER, $GLIBC, $GUI, $GUIBASE, $GUIENV,
       $GVER, $GVERDIR, $OS, $OSVERSION, $OUTPATH, $INPATH, $PATH_SEPERATOR, $XPVERSION,
       $DYNAMIC_CRT, $SET_EXCEPTIONS, $use_shl_versions, $CDPATHx, $JRELIBDIR,
       $JREEXTRALIBDIR, $JRETOOLKITDIR, $JRETHREADDIR, $EXCEPTIONS, $WRAPCMD );
@@ -669,6 +669,15 @@
           $CPUNAME        = "POWERPC";
           $OUTPATH        = "unxmacxp";
       }
+      if ( "@UNIVERSAL_BINARIES@" eq "YES" )
+      {
+          print "Setting values for Mac OS X/Darwin universal binaries... ";
+          $outfile        = "MacOSXUniversalEnv.Set";
+          $OUTPATH        = "unxmacxu";
+          $NATIVE_CPU     = $CPU;
+          $CPU            = "U";
+          $CPUNAME        = "UNIVERSAL";
+      }
       if (@GCCVER@ >= 30401) {
 	  $CVER           = "C341";
       } else {
@@ -1539,6 +1548,7 @@
 ToFile( "JITC_PROCESSOR_TYPE","6",                 "e" );
 }
 ToFile( "DEFAULT_TO_ENGLISH_FOR_PACKING",  "yes", "e" );
+ToFile( "UNIVERSAL_BINARIES","@UNIVERSAL_BINARIES@","e" );
 ToFile( "ENABLE_GTK",        "@ENABLE_GTK@",       "e" );
 ToFile( "ENABLE_HEADLESS",   "@ENABLE_HEADLESS@",  "e" );
 ToFile( "GTK_CFLAGS",        "@GTK_CFLAGS@",       "e" );
@@ -1632,6 +1642,10 @@
 ToFile( "COM",               $COM,               "e" );
 ToFile( "COMPATH",           $COMPATH,           "e" );
 ToFile( "CPU",               $CPU,               "e" );
+if ( "@UNIVERSAL_BINARIES@" eq "YES" )
+{
+ToFile( "NATIVE_CPU",        $NATIVE_CPU,        "e" );
+}
 ToFile( "CPUNAME",           $CPUNAME,           "e" );
 ToFile( "CVER",              $CVER,              "e" );
 ToFile( "GUI",               $GUI,               "e" );