diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
index 68fc87cf328c..35f767179812 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/InstallData.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: InstallData.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-03 11:48:43 $
+ *  last change: $Author: ihi $ $Date: 2007-07-12 11:18:04 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -79,6 +79,7 @@ public class InstallData
     static private String installRoot = null;     /* Root directory for Solaris user installation */
     static private String defaultDir = "/opt/OpenOffice.org";
     static private String packageFormat = null;
+    static private String architecture = null;
     static private String packagePath = null;
     static private String packageSubdir = "packages";
     static private String adminFileNameReloc = null;
@@ -320,6 +321,14 @@ public class InstallData
         packageFormat = format;
     }
 
+    public String getArchitecture() {
+        return architecture;
+    }
+
+    public void setArchitecture(String arch) {
+        architecture = arch;
+    }
+
     public String getLocalTempPath() {
         return localTempPath;
     }
diff --git a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
index e60140c6a922..fc6defb62419 100755
--- a/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
+++ b/javainstaller2/src/JavaSetup/org/openoffice/setup/SetupData/ProductDescription.java
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ProductDescription.java,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: rt $ $Date: 2007-07-03 11:59:13 $
+ *  last change: $Author: ihi $ $Date: 2007-07-12 11:18:27 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -205,6 +205,15 @@ public class ProductDescription {
                 }
             }
 
+            /* check for the architecture of this installation set */
+           section = data.getElement("architecture");
+            if (section != null) {
+                String value = section.getValue();
+                if ((value != null) && (! value.equals(""))) {
+                    installData.setArchitecture(value);
+                }
+            }
+
             /* check for any macro definitions */
             for (Enumeration e = data.elements(); e.hasMoreElements(); ) {
                 XMLPackageDescription p = (XMLPackageDescription) e.nextElement();