diff --git a/base/shell/filebrowser/filebrowser.exe.manifest b/base/shell/filebrowser/filebrowser.exe.manifest
index 55d0c638c05..39331bdf6bc 100644
--- a/base/shell/filebrowser/filebrowser.exe.manifest
+++ b/base/shell/filebrowser/filebrowser.exe.manifest
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
     version="1.0.0.0"
-    processorArchitecture="X86"
+    processorArchitecture="*"
     name="ReactOS.FileBrowser"
     type="win32"
 />
@@ -13,10 +13,10 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="X86"
+            processorArchitecture="*"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />
     </dependentAssembly>
 </dependency>
-</assembly>
\ No newline at end of file
+</assembly>
diff --git a/base/shell/filebrowser/filebrowser.exe.regfree.manifest b/base/shell/filebrowser/filebrowser.exe.regfree.manifest
index bf9498691e3..f252010e8dc 100644
--- a/base/shell/filebrowser/filebrowser.exe.regfree.manifest
+++ b/base/shell/filebrowser/filebrowser.exe.regfree.manifest
@@ -19,7 +19,7 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="X86"
+            processorArchitecture="*"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />
diff --git a/dll/win32/atl80/atl80.manifest b/dll/win32/atl80/atl80.manifest
index 039a3d6aeb4..723630cf001 100644
--- a/dll/win32/atl80/atl80.manifest
+++ b/dll/win32/atl80/atl80.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft.VC80.ATL" version="8.0.50727.4053" processorArchitecture="" publicKeyToken="1fc8b3b9a1e18e3b"/>
+  <assemblyIdentity type="win32" name="Microsoft.VC80.ATL" version="8.0.50727.4053" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b"/>
   <file name="atl80.dll"/>
 </assembly>
diff --git a/dll/win32/gdiplus/gdiplus.manifest b/dll/win32/gdiplus/gdiplus.manifest
index 86c32a078b5..112b7b34582 100644
--- a/dll/win32/gdiplus/gdiplus.manifest
+++ b/dll/win32/gdiplus/gdiplus.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.6000.16386" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/>
+  <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.0.6000.16386" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"/>
   <file name="gdiplus.dll"/>
 </assembly>
diff --git a/dll/win32/gdiplus/gdiplus11.manifest b/dll/win32/gdiplus/gdiplus11.manifest
index c39804bca61..b02a6b864e5 100644
--- a/dll/win32/gdiplus/gdiplus11.manifest
+++ b/dll/win32/gdiplus/gdiplus11.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="" publicKeyToken="6595b64144ccf1df"/>
+  <assemblyIdentity type="win32" name="Microsoft.Windows.GdiPlus" version="1.1.7601.23038" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"/>
   <file name="gdiplus.dll"/>
 </assembly>
diff --git a/dll/win32/msxml3/msxml3.manifest b/dll/win32/msxml3/msxml3.manifest
index 02793c173c3..4e6e42fe3b5 100644
--- a/dll/win32/msxml3/msxml3.manifest
+++ b/dll/win32/msxml3/msxml3.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML30" version="6.0.6000.16386" processorArchitecture="" publicKeyToken="31bf3856ad364e35"/>
+  <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML30" version="6.0.6000.16386" processorArchitecture="*" publicKeyToken="31bf3856ad364e35"/>
   <file name="msxml3.dll"/>
 </assembly>
diff --git a/dll/win32/msxml4/msxml4.manifest b/dll/win32/msxml4/msxml4.manifest
index 4851600f1c6..7d8b4389939 100644
--- a/dll/win32/msxml4/msxml4.manifest
+++ b/dll/win32/msxml4/msxml4.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft.MSXML2" version="4.1.0.0" processorArchitecture="" publicKeyToken="6bd6b9abf345378f"/>
+  <assemblyIdentity type="win32" name="Microsoft.MSXML2" version="4.1.0.0" processorArchitecture="*" publicKeyToken="6bd6b9abf345378f"/>
   <file name="msxml4.dll"/>
 </assembly>
diff --git a/dll/win32/msxml6/msxml6.manifest b/dll/win32/msxml6/msxml6.manifest
index 8179006bc93..881ff80b06e 100644
--- a/dll/win32/msxml6/msxml6.manifest
+++ b/dll/win32/msxml6/msxml6.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML60" version="6.0.6000.16386" processorArchitecture="" publicKeyToken="31bf3856ad364e35"/>
+  <assemblyIdentity type="win32" name="Microsoft-Windows-MSXML60" version="6.0.6000.16386" processorArchitecture="*" publicKeyToken="31bf3856ad364e35"/>
   <file name="msxml6.dll"/>
 </assembly>
diff --git a/modules/rosapps/applications/explorer-old/explorer.exe.manifest b/modules/rosapps/applications/explorer-old/explorer.exe.manifest
index 1035bef08b2..3358d61c3d7 100644
--- a/modules/rosapps/applications/explorer-old/explorer.exe.manifest
+++ b/modules/rosapps/applications/explorer-old/explorer.exe.manifest
@@ -2,7 +2,7 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
     version="1.0.0.0"
-    processorArchitecture="X86"
+    processorArchitecture="*"
     name="ReactOS.Explorer"
     type="win32"
 />
@@ -13,7 +13,7 @@
             type="win32"
             name="Microsoft.Windows.Common-Controls"
             version="6.0.0.0"
-            processorArchitecture="X86"
+            processorArchitecture="*"
             publicKeyToken="6595b64144ccf1df"
             language="*"
         />
diff --git a/modules/rostests/apitests/kernel32/classtest.manifest b/modules/rostests/apitests/kernel32/classtest.manifest
index 902c194a95d..485d826cce7 100644
--- a/modules/rostests/apitests/kernel32/classtest.manifest
+++ b/modules/rostests/apitests/kernel32/classtest.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="ReactOS-TestLib" version="2.2.2.2" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
+  <assemblyIdentity type="win32" name="ReactOS-TestLib" version="2.2.2.2" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"/>
   <file name="testlib.dll">
     <windowClass>Button</windowClass>
     <windowClass>ButtonListBox</windowClass>
diff --git a/modules/rostests/apitests/kernel32/classtest2.manifest b/modules/rostests/apitests/kernel32/classtest2.manifest
index dc6dcd1ed12..ff763ffb8f0 100644
--- a/modules/rostests/apitests/kernel32/classtest2.manifest
+++ b/modules/rostests/apitests/kernel32/classtest2.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="ReactOS-TestLib" version="1.1.1.1" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
+  <assemblyIdentity type="win32" name="ReactOS-TestLib" version="1.1.1.1" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"/>
   <file name="testlib.dll">
     <windowClass>ButtonListBox</windowClass>
     <windowClass>ComboBoxEx32</windowClass>
diff --git a/modules/rostests/apitests/kernel32/dep1.manifest b/modules/rostests/apitests/kernel32/dep1.manifest
index 64ffd898bc9..3f1edc8397d 100644
--- a/modules/rostests/apitests/kernel32/dep1.manifest
+++ b/modules/rostests/apitests/kernel32/dep1.manifest
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="dep1" version="0.4.4.0" processorArchitecture="x86" />
+  <assemblyIdentity type="win32" name="dep1" version="0.4.4.0" processorArchitecture="*" />
   <file name="dep1.dll"/>
 </assembly>
diff --git a/modules/rostests/apitests/kernel32/deptest.manifest b/modules/rostests/apitests/kernel32/deptest.manifest
index 567134f96ab..8471929f6c2 100644
--- a/modules/rostests/apitests/kernel32/deptest.manifest
+++ b/modules/rostests/apitests/kernel32/deptest.manifest
@@ -7,7 +7,7 @@
                   type="win32"
                   name="dep1"
                   version="0.4.4.0"
-                  processorArchitecture="x86"
+                  processorArchitecture="*"
                   />
           </dependentAssembly>
   </dependency>
diff --git a/modules/rostests/apitests/kernel32/redirptest/redir2dep.manifest b/modules/rostests/apitests/kernel32/redirptest/redir2dep.manifest
index fcc136f2f05..c19b4531410 100644
--- a/modules/rostests/apitests/kernel32/redirptest/redir2dep.manifest
+++ b/modules/rostests/apitests/kernel32/redirptest/redir2dep.manifest
@@ -6,7 +6,7 @@
                   type="win32"
                   name="redirtest2"
                   version="0.2.2.2"
-                  processorArchitecture="x86"
+                  processorArchitecture="*"
                   />
           </dependentAssembly>
   </dependency>
diff --git a/modules/rostests/apitests/kernel32/redirptest/redirtest2.manifest b/modules/rostests/apitests/kernel32/redirptest/redirtest2.manifest
index 21ae9497191..f2cea040b5e 100644
--- a/modules/rostests/apitests/kernel32/redirptest/redirtest2.manifest
+++ b/modules/rostests/apitests/kernel32/redirptest/redirtest2.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="redirtest2" version="0.2.2.2" processorArchitecture="x86" />
+  <assemblyIdentity type="win32" name="redirtest2" version="0.2.2.2" processorArchitecture="*" />
   <file name="kernel32test_versioned.dll"/>
 </assembly>
  
\ No newline at end of file
diff --git a/modules/rostests/apitests/user32/verclasstest1.manifest b/modules/rostests/apitests/user32/verclasstest1.manifest
index faba9099f17..807fd1cba35 100644
--- a/modules/rostests/apitests/user32/verclasstest1.manifest
+++ b/modules/rostests/apitests/user32/verclasstest1.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="verclasstest1" version="2.2.2.2" processorArchitecture="x86"/>
+  <assemblyIdentity type="win32" name="verclasstest1" version="2.2.2.2" processorArchitecture="*"/>
   <file name="user32_apitest.dll">
     <windowClass>VersionTestClass1</windowClass>
     <windowClass>VersionTestClass2</windowClass>
diff --git a/modules/rostests/apitests/user32/verclasstest2.manifest b/modules/rostests/apitests/user32/verclasstest2.manifest
index d7a3a2806a6..aa3189429e5 100644
--- a/modules/rostests/apitests/user32/verclasstest2.manifest
+++ b/modules/rostests/apitests/user32/verclasstest2.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity type="win32" name="verclasstest2" version="3.3.3.3" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df"/>
+  <assemblyIdentity type="win32" name="verclasstest2" version="3.3.3.3" processorArchitecture="*" publicKeyToken="6595b64144ccf1df"/>
   <file name="user32_apitest.exe">
     <windowClass>VersionTestClass1</windowClass>
     <windowClass>VersionTestClass2</windowClass>
diff --git a/modules/rostests/kmtests/kmtest/kmtest.exe.manifest b/modules/rostests/kmtests/kmtest/kmtest.exe.manifest
index 07b59440c3f..b69e266a506 100644
--- a/modules/rostests/kmtests/kmtest/kmtest.exe.manifest
+++ b/modules/rostests/kmtests/kmtest/kmtest.exe.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-  <assemblyIdentity version="1.0.0.0" processorArchitecture="x86" name="kmtest"/>
+  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="kmtest"/>
   <description>ReactOS Kernel-Mode Test Suite Loader Application</description>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>