diff --git a/com.amd.aparapi.jni/build.xml b/com.amd.aparapi.jni/build.xml
index 666b2f1d8f4dd6bdaee57de06ff2430fbf32a446..927f2f086ad516e9f62105e6025dbb0605efa30b 100644
--- a/com.amd.aparapi.jni/build.xml
+++ b/com.amd.aparapi.jni/build.xml
@@ -315,17 +315,11 @@ First consider editing the properties in build.properties
       </condition>
 
       <condition property="optional.amd64.subdir" value="" else="amd64\">
-         <or>
-            <os arch="x86" />
-            <os arch="i386" />
-         </or>
+         <equals arg1="${x86_or_x86_64}" arg2="x86"/>
       </condition>
 
       <condition property="optional.x64.subdir" value="" else="x64\">
-         <or>
-            <os arch="x86" />
-            <os arch="i386" />
-         </or>
+        <equals arg1="${x86_or_x86_64}" arg2="x86"/>
       </condition>