diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml
index a0bec1274..d15cf1293 100644
--- a/F-Droid/AndroidManifest.xml
+++ b/F-Droid/AndroidManifest.xml
@@ -273,15 +273,6 @@
                 <data android:scheme="fdroid.app" />
             </intent-filter>
 
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="market" android:host="details" />
-            </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -295,6 +286,15 @@
                 <data android:pathPrefix="/app/" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="market" android:host="details" />
+            </intent-filter>
+
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 
@@ -307,6 +307,28 @@
                 <data android:path="/store/apps/details" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="amzn" android:host="apps" android:path="/android" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data android:scheme="http" />
+                <data android:scheme="https" />
+                <data android:host="amazon.com" />
+                <data android:host="www.amazon.com" />
+                <data android:path="/gp/mas/dl/android" />
+            </intent-filter>
+
         </activity>
         <activity
             android:label="@string/menu_preferences"
diff --git a/F-Droid/src/org/fdroid/fdroid/AppDetails.java b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
index ad514aa50..f97e7908b 100644
--- a/F-Droid/src/org/fdroid/fdroid/AppDetails.java
+++ b/F-Droid/src/org/fdroid/fdroid/AppDetails.java
@@ -372,6 +372,11 @@ public class AppDetails extends ActionBarActivity implements ProgressListener, A
                     // market://details?id=app.id
                     // https://play.google.com/store/apps/details?id=app.id
                     appId = data.getQueryParameter("id");
+                } else if (host.equals("apps") || host.equals("amazon.com") ||
+                        host.equals("www.amazon.com")) {
+                    // amzn://apps/android?p=app.id
+                    // http://www.amazon.com/gp/mas/dl/android?p=app.id
+                    appId = data.getQueryParameter("p");
                 } else {
                     // https://f-droid.org/app/app.id
                     appId = data.getLastPathSegment();