diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 718e423b3..1ed8d7833 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -62,6 +62,21 @@
       <category android:name="android.intent.category.BROWSABLE" />
       <data android:scheme="https" />
     </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.GET_CAPABILITIES"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.POLL"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.SUBSCRIBE"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.SUBSCRIPTION_CHANGE"/>
+    </intent>
+    <intent>
+      <action android:name="org.traffxml.traff.UNSUBSCRIBE"/>
+    </intent>
   </queries>
 
   <supports-screens
diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.hpp b/android/app/src/main/cpp/app/organicmaps/Framework.hpp
index 13a4c2a36..9d75269b8 100644
--- a/android/app/src/main/cpp/app/organicmaps/Framework.hpp
+++ b/android/app/src/main/cpp/app/organicmaps/Framework.hpp
@@ -122,6 +122,8 @@ namespace android
       return m_work.GetRoutingManager().GetLastUsedRouter();
     }
 
+    TrafficManager & GetTrafficManager() { return m_work.GetTrafficManager(); }
+
     void Resize(JNIEnv * env, jobject jSurface, int w, int h);
 
     struct Finger
diff --git a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
index 8e676c733..5a07a18a6 100644
--- a/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/sdk/OrganicMaps.cpp
@@ -1,6 +1,7 @@
 #include "app/organicmaps/Framework.hpp"
 
 #include "app/organicmaps/platform/AndroidPlatform.hpp"
+#include "app/organicmaps/traffxml/AndroidTraffSource.hpp"
 
 #include "app/organicmaps/core/jni_helper.hpp"
 
@@ -33,8 +34,28 @@ JNIEXPORT void JNICALL Java_app_organicmaps_sdk_OrganicMaps_nativeInitFramework(
       [onComplete = jni::make_global_ref(onComplete)]()
       {
         JNIEnv * env = jni::GetEnv();
-        jmethodID const methodId = jni::GetMethodID(env, *onComplete, "run", "()V");
-        env->CallVoidMethod(*onComplete, methodId);
+        jmethodID const runId = jni::GetMethodID(env, *onComplete, "run", "()V");
+        env->CallVoidMethod(*onComplete, runId);
+
+        ASSERT(g_framework, ("g_framework must be non-null"));
+
+        /*
+         * Add traffic sources for Android.
+         */
+        jclass configClass = env->FindClass("app/organicmaps/util/Config");
+        jmethodID const getTrafficLegacyEnabledId = jni::GetStaticMethodID(env, configClass,
+                                                                           "getTrafficLegacyEnabled", "()Z");
+        jmethodID const applyTrafficLegacyEnabledId = jni::GetStaticMethodID(env, configClass,
+                                                                             "applyTrafficLegacyEnabled", "(Z)V");
+        jmethodID const getTrafficAppsId = jni::GetStaticMethodID(env, configClass,
+                                                                  "getTrafficApps", "()[Ljava/lang/String;");
+        jmethodID const applyTrafficAppsId = jni::GetStaticMethodID(env, configClass,
+                                                                    "applyTrafficApps", "([Ljava/lang/String;)V");
+
+        env->CallStaticVoidMethod(configClass, applyTrafficLegacyEnabledId,
+                                  env->CallStaticBooleanMethod(configClass, getTrafficLegacyEnabledId));
+        env->CallStaticVoidMethod(configClass, applyTrafficAppsId,
+                                  (jobjectArray)env->CallStaticObjectMethod(configClass, getTrafficAppsId));
       });
   }
 }
diff --git a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp b/android/app/src/main/cpp/app/organicmaps/util/Config.cpp
index c934152b6..f0e3a4beb 100644
--- a/android/app/src/main/cpp/app/organicmaps/util/Config.cpp
+++ b/android/app/src/main/cpp/app/organicmaps/util/Config.cpp
@@ -152,4 +152,45 @@ extern "C"
       frm()->SaveTrafficHttpUrl(jni::ToNativeString(env, value));
       frm()->SetTrafficHttpUrl(jni::ToNativeString(env, value));
     }
+
+    JNIEXPORT void JNICALL
+    Java_app_organicmaps_util_Config_applyTrafficLegacyEnabled(JNIEnv * env, jclass thiz,
+                                                               jboolean value)
+    {
+      TrafficManager & tm = g_framework->GetTrafficManager();
+      tm.RemoveTraffSourceIf([](traffxml::TraffSource* source) {
+        if (traffxml::AndroidTraffSourceV0_7* traffSource = dynamic_cast<traffxml::AndroidTraffSourceV0_7*>(source))
+        {
+          traffSource->Close();
+          return true;
+        }
+        else
+          return false;
+      });
+      if (value)
+	traffxml::AndroidTraffSourceV0_7::Create(tm);
+    }
+
+    JNIEXPORT void JNICALL
+    Java_app_organicmaps_util_Config_applyTrafficApps(JNIEnv * env, jclass thiz, jobjectArray value)
+    {
+      jsize valueLen = env->GetArrayLength(value);
+      TrafficManager & tm = g_framework->GetTrafficManager();
+      tm.RemoveTraffSourceIf([](traffxml::TraffSource* source) {
+        if (traffxml::AndroidTraffSourceV0_8* traffSource = dynamic_cast<traffxml::AndroidTraffSourceV0_8*>(source))
+        {
+          traffSource->Close();
+          return true;
+        }
+        else
+          return false;
+      });
+      for (jsize i = 0; i < valueLen; i++)
+      {
+        jstring jAppId = (jstring)env->GetObjectArrayElement(value, i);
+        std::string appId = jni::ToNativeString(env, jAppId);
+        traffxml::AndroidTraffSourceV0_8::Create(tm, appId);
+        env->DeleteLocalRef(jAppId);
+      }
+    }
 } // extern "C"
diff --git a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
index 1d7e3a2b7..3e50ea039 100644
--- a/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
+++ b/android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
@@ -3,8 +3,11 @@ package app.organicmaps.settings;
 import static app.organicmaps.leftbutton.LeftButtonsHolder.DISABLE_BUTTON_CODE;
 
 import android.annotation.SuppressLint;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.view.View;
 
@@ -13,6 +16,7 @@ import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
 import androidx.preference.EditTextPreference;
 import androidx.preference.ListPreference;
+import androidx.preference.MultiSelectListPreference;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceCategory;
 import androidx.preference.TwoStatePreference;
@@ -38,6 +42,8 @@ import app.organicmaps.util.ThemeSwitcher;
 import app.organicmaps.util.Utils;
 import app.organicmaps.util.log.LogsManager;
 import app.organicmaps.sdk.search.SearchRecents;
+import app.organicmaps.traffxml.AndroidTransport;
+
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
@@ -46,6 +52,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements LanguagesFragment.Listener
 {
@@ -69,6 +76,8 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     initTransliterationPrefsCallbacks();
     initTrafficHttpEnabledPrefsCallbacks();
     initTrafficHttpUrlPrefsCallbacks();
+    initTrafficAppsPrefs();
+    initTrafficLegacyEnabledPrefsCallbacks();
     init3dModePrefsCallbacks();
     initPerspectivePrefsCallbacks();
     initAutoZoomPrefsCallbacks();
@@ -154,6 +163,36 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
       pref.setSummary(summary);
   }
 
+  private void updateTrafficAppsSummary()
+  {
+    final MultiSelectListPreference pref = getPreference(getString(R.string.pref_traffic_apps));
+    /*
+     * If the preference is disabled, it has not been initialized. This is the case if no TraFF
+     * apps were found. The code below would crash when trying to access the entries, and there
+     * is no need to update the summary if the setting cannot be changed.
+     */
+    if (!pref.isEnabled())
+      return;
+    String[] apps = Config.getTrafficApps();
+    if (apps.length == 0)
+      pref.setSummary(R.string.traffic_apps_none_selected);
+    else
+    {
+      String summary = "";
+      for (int i = 0; i < apps.length; i++)
+      {
+        if (i > 0)
+          summary = summary + ", ";
+        int index = pref.findIndexOfValue(apps[i]);
+        if (i >= 0)
+          summary = summary + pref.getEntries()[index];
+        else
+          summary = summary + apps[i];
+      }
+      pref.setSummary(summary);
+    }
+  }
+
   private void updateRoutingSettingsPrefsSummary()
   {
     final Preference pref = getPreference(getString(R.string.prefs_routing));
@@ -182,6 +221,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     updateRoutingSettingsPrefsSummary();
     updateMapLanguageCodeSummary();
     updateTrafficHttpUrlSummary();
+    updateTrafficAppsSummary();
   }
 
   @Override
@@ -271,6 +311,61 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment implements La
     });
   }
 
+  private void initTrafficAppsPrefs()
+  {
+    final MultiSelectListPreference pref = getPreference(getString(R.string.pref_traffic_apps));
+    
+    PackageManager pm = getContext().getPackageManager();
+    List<ResolveInfo> receivers = pm.queryBroadcastReceivers(new Intent(AndroidTransport.ACTION_TRAFF_GET_CAPABILITIES), 0);
+    
+    if (receivers == null || receivers.isEmpty())
+    {
+      pref.setSummary(R.string.traffic_apps_not_available);
+      pref.setEnabled(false);
+      return;
+    }
+    
+    pref.setEnabled(true);
+
+    List<String> entryList = new ArrayList<>(receivers.size());
+    List<String> valueList = new ArrayList<>(receivers.size());
+
+    for (ResolveInfo receiver : receivers)
+    {
+      // friendly name
+      entryList.add(receiver.loadLabel(pm).toString());
+      // actual value (we just need the package name, broadcasts are sent to any receiver in the package)
+      valueList.add(receiver.activityInfo.applicationInfo.packageName);
+    }
+    
+    pref.setEntries(entryList.toArray(new CharSequence[0]));
+    pref.setEntryValues(valueList.toArray(new CharSequence[0]));
+    
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      // newValue is a Set<String>, each item is a package ID
+      String[] apps = ((Set<String>)newValue).toArray(new String[0]);
+      Config.setTrafficApps(apps);
+      updateTrafficAppsSummary();
+
+      return true;
+    });
+  }
+
+  private void initTrafficLegacyEnabledPrefsCallbacks()
+  {
+    final Preference pref = getPreference(getString(R.string.pref_traffic_legacy_enabled));
+
+    ((TwoStatePreference)pref).setChecked(Config.getTrafficLegacyEnabled());
+    pref.setOnPreferenceChangeListener((preference, newValue) -> {
+      final boolean oldVal = Config.getTrafficLegacyEnabled();
+      final boolean newVal = (Boolean) newValue;
+      if (oldVal != newVal)
+        Config.setTrafficLegacyEnabled(newVal);
+
+      return true;
+    });
+  }
+
   private void initUseMobileDataPrefsCallbacks()
   {
     final ListPreference mobilePref = getPreference(getString(R.string.pref_use_mobile_data));
diff --git a/android/app/src/main/java/app/organicmaps/traffxml/SourceImplV0_8.java b/android/app/src/main/java/app/organicmaps/traffxml/SourceImplV0_8.java
index 4729643c8..753875ec1 100644
--- a/android/app/src/main/java/app/organicmaps/traffxml/SourceImplV0_8.java
+++ b/android/app/src/main/java/app/organicmaps/traffxml/SourceImplV0_8.java
@@ -54,6 +54,12 @@ public class SourceImplV0_8 extends SourceImpl
     }
 
     context.registerReceiver(this, filter);
+    
+    Bundle extras = new Bundle();
+    extras.putString(AndroidTransport.EXTRA_PACKAGE, context.getPackageName());
+    extras.putString(AndroidTransport.EXTRA_FILTER_LIST, filterList);
+    AndroidConsumer.sendTraffIntent(context, AndroidTransport.ACTION_TRAFF_SUBSCRIBE, null,
+        extras, packageName, Manifest.permission.ACCESS_COARSE_LOCATION, this);
   }
 
   /**
@@ -114,6 +120,8 @@ public class SourceImplV0_8 extends SourceImpl
           else
             Logger.e(this.getClass().getSimpleName(), String.format("subscription failed, %s",
                       AndroidTransport.formatTraffError(this.getResultCode())));
+          if (this.getResultCode() == AndroidTransport.RESULT_INTERNAL_ERROR)
+            Logger.e(this.getClass().getSimpleName(), "Make sure the TraFF source app has at least coarse location permission, even when running in background");
           return;
       }
       Bundle extras = this.getResultExtras(true);
diff --git a/android/app/src/main/java/app/organicmaps/util/Config.java b/android/app/src/main/java/app/organicmaps/util/Config.java
index 418ebb7b2..06fcb6c85 100644
--- a/android/app/src/main/java/app/organicmaps/util/Config.java
+++ b/android/app/src/main/java/app/organicmaps/util/Config.java
@@ -55,6 +55,16 @@ public final class Config
    * True if the first start animation has been seen.
    */
   private static final String KEY_MISC_FIRST_START_DIALOG_SEEN = "FirstStartDialogSeen";
+  
+  /**
+   * Whether feeds from legacy TraFF applications (TraFF 0.7, Android transport) are enabled.
+   */
+  private static final String KEY_TRAFFIC_LEGACY_ENABLED = "TrafficLegacyEnabled";
+
+  /**
+   * TraFF (0.8+) applications from which to request traffic data.
+   */
+  private static final String KEY_TRAFFIC_APPS = "TrafficApps";
 
   private Config() {}
 
@@ -338,6 +348,38 @@ public final class Config
   {
     nativeSetTrafficHttpUrl(value);
   }
+  
+  public static String[] getTrafficApps()
+  {
+    String appString = getString(KEY_TRAFFIC_APPS, "");
+    if (appString.length() == 0)
+      return new String[0];
+    return appString.split(",");
+  }
+  
+  public static void setTrafficApps(String[] value)
+  {
+    String valueString = "";
+    for (int i = 0; i < value.length; i++)
+    {
+      valueString = valueString + value[i];
+      if ((i + 1) < value.length)
+        valueString = valueString + ",";
+    }
+    setString(KEY_TRAFFIC_APPS, valueString);
+    applyTrafficApps(value);
+  }
+
+  public static boolean getTrafficLegacyEnabled()
+  {
+    return getBool(KEY_TRAFFIC_LEGACY_ENABLED, false);
+  }
+
+  public static void setTrafficLegacyEnabled(boolean value)
+  {
+    setBool(KEY_TRAFFIC_LEGACY_ENABLED, value);
+    applyTrafficLegacyEnabled(value);
+  }
 
   public static boolean isNY()
   {
@@ -496,4 +538,6 @@ public final class Config
   private static native void nativeSetTrafficHttpEnabled(boolean value);
   private static native String nativeGetTrafficHttpUrl();
   private static native void nativeSetTrafficHttpUrl(String value);
+  private static native void applyTrafficApps(String[] value);
+  private static native void applyTrafficLegacyEnabled(boolean value);
 }
diff --git a/android/app/src/main/res/values/donottranslate.xml b/android/app/src/main/res/values/donottranslate.xml
index c6294b18f..046304210 100644
--- a/android/app/src/main/res/values/donottranslate.xml
+++ b/android/app/src/main/res/values/donottranslate.xml
@@ -35,8 +35,11 @@
   <string name="pref_settings_general" translatable="false">GeneralSettings</string>
   <string name="pref_navigation" translatable="false">Navigation</string>
   <string name="pref_information" translatable="false">Information</string>
+  <string name="pref_traffic" translatable="false">Traffic</string>
   <string name="pref_traffic_http_enabled" translatable="false">TrafficHttpEnabled</string>
   <string name="pref_traffic_http_url" translatable="false">TrafficHttpUrl</string>
+  <string name="pref_traffic_apps" translatable="false">TrafficApps</string>
+  <string name="pref_traffic_legacy_enabled" translatable="false">TrafficLegacyEnabled</string>
   <string name="pref_transliteration" translatable="false">Transliteration</string>
   <string name="pref_power_management" translatable="false">PowerManagment</string>
   <string name="pref_keep_screen_on" translatable="false">KeepScreenOn</string>
diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml
index f26902f99..e28573b37 100644
--- a/android/app/src/main/res/values/strings.xml
+++ b/android/app/src/main/res/values/strings.xml
@@ -234,6 +234,7 @@
     <!-- Settings information group in settings screen -->
     <string name="prefs_group_information">Information</string>
     <string name="prefs_group_route">Navigation</string>
+    <string name="prefs_group_traffic">Traffic information</string>
     <string name="pref_zoom_title">Zoom buttons</string>
     <string name="pref_zoom_summary">Display on the map</string>
     <!-- Settings «Map» category: «Night style» title -->
@@ -838,6 +839,16 @@
     <string name="traffic_http_url">Traffic service URL</string>
     <!-- Status message indicating that user did not set a traffic URL yet. -->
     <string name="traffic_http_url_not_set">Not set</string>
+    <!-- TraFF 0.8 apps from which to receive data (title) -->
+    <string name="traffic_apps">Use data from TraFF applications</string>
+    <!-- Status message indicating that no TraFF 0.8 apps are installed -->
+    <string name="traffic_apps_not_available">No apps installed</string>
+    <!-- Status message indicating that no TraFF 0.8 apps are currently selected -->
+    <string name="traffic_apps_none_selected">No apps salected</string>
+    <!-- Enable traffic data from TraFF 0.7 apps (title) -->
+    <string name="traffic_legacy_enabled">Use data from legacy TraFF applications</string>
+    <!-- Enable traffic data from TraFF 0.7 apps (description) -->
+    <string name="traffic_legacy_enabled_description">When enabled, the app will receive and process traffic data from legacy TraFF applications.</string>
     <!-- OpenStreetMap text on splash screen -->
     <string name="splash_subtitle">Map data from OpenStreetMap</string>
     <!-- Telegram group url for the "?" About page -->
diff --git a/android/app/src/main/res/xml/prefs_main.xml b/android/app/src/main/res/xml/prefs_main.xml
index 625a86e74..421f7a4a1 100644
--- a/android/app/src/main/res/xml/prefs_main.xml
+++ b/android/app/src/main/res/xml/prefs_main.xml
@@ -119,18 +119,6 @@
         app:singleLineTitle="false"
         android:persistent="false"
         android:order="19"/>
-    <SwitchPreferenceCompat
-      android:key="@string/pref_traffic_http_enabled"
-      android:title="@string/traffic_http_enabled"
-      app:singleLineTitle="false"
-      android:summary="@string/traffic_http_enabled_description"
-      android:defaultValue="true"
-      android:order="20"/>
-    <EditTextPreference
-      android:key="@string/pref_traffic_http_url"
-      android:title="@string/traffic_http_url"
-      app:singleLineTitle="false"
-      android:order="21"/>
   </androidx.preference.PreferenceCategory>
 
   <androidx.preference.PreferenceCategory
@@ -172,6 +160,36 @@
       </intent>
     </PreferenceScreen>
   </androidx.preference.PreferenceCategory>
+  <androidx.preference.PreferenceCategory
+    android:key="@string/pref_traffic"
+    android:title="@string/prefs_group_traffic"
+    android:order="4">
+    <SwitchPreferenceCompat
+      android:key="@string/pref_traffic_http_enabled"
+      android:title="@string/traffic_http_enabled"
+      app:singleLineTitle="false"
+      android:summary="@string/traffic_http_enabled_description"
+      android:defaultValue="true"
+      android:order="1"/>
+    <EditTextPreference
+      android:key="@string/pref_traffic_http_url"
+      android:title="@string/traffic_http_url"
+      app:singleLineTitle="false"
+      android:order="2"/>
+    <MultiSelectListPreference
+      android:key="@string/pref_traffic_apps"
+      android:title="@string/traffic_apps"
+      app:singleLineTitle="false"
+      android:order="3"/>
+    <SwitchPreferenceCompat
+      android:key="@string/pref_traffic_legacy_enabled"
+      android:title="@string/traffic_legacy_enabled"
+      app:singleLineTitle="false"
+      android:summary="@string/traffic_legacy_enabled_description"
+      android:defaultValue="true"
+      android:order="4"/>
+  </androidx.preference.PreferenceCategory>
+
   <androidx.preference.PreferenceCategory
     android:key="@string/pref_privacy"
     android:title="@string/privacy"
diff --git a/map/traffic_manager.cpp b/map/traffic_manager.cpp
index 566da6b74..ca85b7437 100644
--- a/map/traffic_manager.cpp
+++ b/map/traffic_manager.cpp
@@ -944,6 +944,17 @@ void TrafficManager::SetHttpTraffSource(bool enabled, std::string url)
     traffxml::HttpTraffSource::Create(*this, url);
 }
 
+void TrafficManager::RemoveTraffSourceIf(const std::function<bool(traffxml::TraffSource *)> &pred)
+{
+  std::lock_guard<std::mutex> lock(m_trafficSourceMutex);
+
+  for (auto it = m_trafficSources.begin(); it != m_trafficSources.end(); )
+    if (pred(it->get()))
+      m_trafficSources.erase(it);
+    else
+      ++it;
+}
+
 bool TrafficManager::IsInvalidState() const
 {
   return m_state == TrafficState::NetworkError;
diff --git a/map/traffic_manager.hpp b/map/traffic_manager.hpp
index 7b4fbe08e..6e14bb4c7 100644
--- a/map/traffic_manager.hpp
+++ b/map/traffic_manager.hpp
@@ -190,6 +190,22 @@ public:
    */
   void SetHttpTraffSource(bool enabled, std::string url);
 
+  /**
+   * @brief Removes all `TraffSource` instances which satisfy a predicate.
+   *
+   * This method iterates over all currently configured `TraffSource` instances and calls the
+   * caller-suppplied predicate function `pred` on each of them. If `pred` returns true, the source
+   * is removed, else it is kept.
+   *
+   * @todo For now, `pred` deliberately takes a non-const argument so we can do cleanup inside
+   * `pred`. If we manage to move any such cleanup into the destructor of the `TraffSource` subclass
+   * and get rid of any `Close()` methods in subclasses (which is preferable for other reasons as
+   * well), the argument can be made const.
+   *
+   * @param pred The predicate function, see description.
+   */
+  void RemoveTraffSourceIf(const std::function<bool(traffxml::TraffSource*)>& pred);
+
   /**
    * @brief Starts the traffic manager.
    *