diff -urN ooo_SRC680_m161_src.orig/solenv/inc/unxmacxu.mk ooo_SRC680_m161_src/solenv/inc/unxmacxu.mk
--- ooo_SRC680_m161_src.orig/solenv/inc/unxmacxu.mk	1970-01-01 01:00:00.000000000 +0100
+++ ooo_SRC680_m161_src/solenv/inc/unxmacxu.mk	2006-04-01 16:01:04.000000000 +0200
@@ -0,0 +1,69 @@
+#*************************************************************************
+#
+#   OpenOffice.org - a multi-platform office productivity suite
+#
+#   $RCSfile: unxmacxu.mk,v $
+#
+#   $Revision: 1.58 $
+#
+#   last change: $Author: rt $ $Date: 2006/03/08 14:13:29 $
+#
+#   The Contents of this file are made available subject to
+#   the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+#     GNU Lesser General Public License Version 2.1
+#     =============================================
+#     Copyright 2005 by Sun Microsystems, Inc.
+#     901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License version 2.1, as published by the Free Software Foundation.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#     MA  02111-1307  USA
+#
+#*************************************************************************
+
+#
+# Mac OS X Universal binaries specific defines
+#
+
+# FIXME: how to solve these properly
+# No defines at all?
+# PROCESSOR_DEFINES=-DPOWERPC -DPPC
+
+DLLPOSTFIX=mxu
+
+# Include generic Mac OS X makefile
+.INCLUDE : unxmacx.mk
+
+# Architectures for universal build
+UNIVERSAL_ARCHS=-arch i386 -arch ppc
+
+# Univerl SDK path
+UNIVERSAL_SDK=/Developer/SDKs/MacOSX10.4u.sdk
+
+# Compile and link flags for universal binaries
+UNIVERSAL_CFLAGS=$(UNIVERSAL_ARCHS)
+UNIVERSAL_LDFLAGS=$(UNIVERSAL_ARCHS)
+
+# HACK: Intel processors have completely universal libraries so there is no
+# need to specify -sysroot -syslibroot when on Intel
+.IF "$(NATIVE_CPU)" == "P"
+UNIVERSAL_CFLAGS+=-isysroot $(UNIVERSAL_SDK)
+UNIVERSAL_LDFLAGS+=-Wl,-syslibroot,$(UNIVERSAL_SDK)
+.ENDIF
+
+CFLAGSCC+=$(UNIVERSAL_CFLAGS)
+CFLAGSCXX+=$(UNIVERSAL_CFLAGS)
+
+LINKFLAGS+=$(UNIVERSAL_LDFLAGS)
diff -urN ooo_SRC680_m161_src.orig/solenv/inc/unx.mk ooo_SRC680_m161_src/solenv/inc/unx.mk
--- ooo_SRC680_m161_src.orig/solenv/inc/unx.mk	2006-02-08 21:08:13.000000000 +0100
+++ ooo_SRC680_m161_src/solenv/inc/unx.mk	2006-03-29 18:40:04.000000000 +0200
@@ -172,12 +172,16 @@
 .INCLUDE : unxirxm.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
-.INCLUDE : unxmacxp.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXI"
-.INCLUDE : unxmacxi.mk
+.IF "$(UNIVERSAL_BINARIES)" == "YES"
+   .INCLUDE : unxmacxu.mk
+.ELSE
+   .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
+   .INCLUDE : unxmacxp.mk
+   .ENDIF
+
+   .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXI"
+   .INCLUDE : unxmacxi.mk
+   .ENDIF
 .ENDIF
 
 # --- general *ix settings ---