diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index d23d1ad69..25e8c2067 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -172,6 +172,14 @@ public class FDroid extends ActionBarActivity {
             query = data.getSchemeSpecificPart();
         }
 
+        // an old format for querying via packageName
+        if (query.startsWith("pname:"))
+            appId = query.split(":")[1];
+
+        // sometimes, search URLs include pub: or other things before the query string
+        if (query.contains(":"))
+            query = query.split(":")[1];
+
         Intent call = null;
         if (appId != null && appId.length() > 0) {
             Log.d(TAG, "FDroid launched via app link for '" + appId + "'");