diff -r 5f667345a734 core.startup/src/org/netbeans/core/startup/CoreBridge.java
--- a/core.startup/src/org/netbeans/core/startup/CoreBridge.java	Mon Sep 20 16:28:30 2010 +0400
+++ b/core.startup/src/org/netbeans/core/startup/CoreBridge.java	Fri Oct 08 03:18:10 2010 +0200
@@ -184,5 +184,11 @@
             provides.add("org.openide.modules.os.Solaris"); // NOI18N
         }
     }
-    
+
+    public static void defineArchTokens(Collection<? super String> provides) {
+        String arch = System.getProperty("os.arch"); // NOI18N
+        if (arch != null && !arch.isEmpty()) {
+            provides.add("org.openide.modules.arch." + arch); // NOI18N
+        }
+    }
 }
diff -r 5f667345a734 core.startup/src/org/netbeans/core/startup/NbInstaller.java
--- a/core.startup/src/org/netbeans/core/startup/NbInstaller.java	Mon Sep 20 16:28:30 2010 +0400
+++ b/core.startup/src/org/netbeans/core/startup/NbInstaller.java	Fri Oct 08 03:18:10 2010 +0200
@@ -779,6 +779,7 @@
         if (m.getCodeNameBase ().equals ("org.openide.modules")) { // NOI18N
             List<String> arr = new ArrayList<String>(4);
             CoreBridge.defineOsTokens(arr);
+            CoreBridge.defineArchTokens(arr);
             
             // module format is now 2
             arr.add("org.openide.modules.ModuleFormat1"); // NOI18N