diff --git a/android-ext.pac b/android-ext.pac
new file mode 100644
index 0000000..d1618bc
--- /dev/null
+++ b/android-ext.pac
@@ -0,0 +1,3 @@
+function FindProxyForURL(url, host) {
+  return "PROXY 127.0.0.1:7950";
+}
diff --git a/i2psetproxy.js@eyedeekay.github.io.xpi b/i2psetproxy.js@eyedeekay.github.io.xpi
index c6ac82a..765ca1b 100644
Binary files a/i2psetproxy.js@eyedeekay.github.io.xpi and b/i2psetproxy.js@eyedeekay.github.io.xpi differ
diff --git a/manifest.json b/manifest.json
index ad71aee..84a71a6 100644
--- a/manifest.json
+++ b/manifest.json
@@ -8,7 +8,7 @@
   "permissions": ["theme", "proxy", "privacy", "storage"],
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
-  "version": "1.20",
+  "version": "1.21",
   "description": "__MSG_extensionDescription__",
   "homepage_url": "https://github.com/eyedeekay/i2psetproxy.js",
   "icons": {
diff --git a/proxy.js b/proxy.js
index c92b7e4..aa96eaf 100644
--- a/proxy.js
+++ b/proxy.js
@@ -34,7 +34,11 @@ function setupProxy() {
     var controlPort = getControlPort();
     if (isFirefox()) {
         if (isDroid()) {
-            browser.proxy.register("android.pac");
+            if (getPort() == "7950") {
+                browser.proxy.register("android-ext.pac");
+            }else{
+                browser.proxy.register("android.pac");
+            }
         }else{
             if (getScheme() == "http") {
                 var proxySettings = {