diff --git a/Rakefile b/Rakefile
index 6a0cbe31..8837b37a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -40,6 +40,7 @@ ANDROID_API_VERSIONS =
   else
     []
   end
+ANDROID_ARCHS = ['armv5te']
 
 verbose(true)
 
@@ -48,7 +49,7 @@ def rake(dir, cmd='all')
     debug = ENV['DEBUG'] ? 'optz_level=0' : ''
     sdk_beta = ENV['SDK_BETA'] ? 'sdk_beta=1' : ''
     trace = Rake.application.options.trace
-    sh "rake xcode_platforms_dir=\"#{XCODE_PLATFORMS_DIR}\" ios_sdk_versions=\"#{IOS_SDK_VERSIONS.join(',')}\" osx_sdk_versions=\"#{OSX_SDK_VERSIONS.join(',')}\" android_sdk=\"#{ANDROID_SDK}\" android_api_versions=\"#{ANDROID_API_VERSIONS.join(',')}\" android_ndk=\"#{ANDROID_NDK}\" project_version=\"#{PROJECT_VERSION}\" #{debug} #{sdk_beta} #{cmd} #{trace ? '--trace' : ''}"
+    sh "rake xcode_platforms_dir=\"#{XCODE_PLATFORMS_DIR}\" ios_sdk_versions=\"#{IOS_SDK_VERSIONS.join(',')}\" osx_sdk_versions=\"#{OSX_SDK_VERSIONS.join(',')}\" android_sdk=\"#{ANDROID_SDK}\" android_api_versions=\"#{ANDROID_API_VERSIONS.join(',')}\" android_ndk=\"#{ANDROID_NDK}\" project_version=\"#{PROJECT_VERSION}\" android_archs=\"#{ANDROID_ARCHS.join(',')}\" #{debug} #{sdk_beta} #{cmd} #{trace ? '--trace' : ''}"
   end
 end
 
diff --git a/data/Rakefile b/data/Rakefile
index 380331fe..fddd1a96 100644
--- a/data/Rakefile
+++ b/data/Rakefile
@@ -4,6 +4,7 @@ OSX_SDK_VERSIONS = ENV['osx_sdk_versions'].split(',')
 
 ANDROID_SDK = ENV['android_sdk']
 ANDROID_API_VERSIONS = ENV['android_api_versions'].split(',')
+ANDROID_ARCHS = ENV['android_archs'].split(',')
 
 verbose(true)
 NEED_STRIP = !ENV['DEBUG']
@@ -425,7 +426,6 @@ end
 
 # TODO - merge to main task
 ANDROID_API_PACKAGES = %w{java android}
-ANDROID_ARCHS = ['armv5'] # XXX add more targets?
 task :android do
   ANDROID_API_VERSIONS.each do |api_vers|
     # Copy runtime library and kernel file