diff --git a/android/3rd_party/FlurryAnalytics-4.2.0.jar b/android/3rd_party/FlurryAnalytics-4.2.0.jar
deleted file mode 100755
index bab7b7f59a..0000000000
Binary files a/android/3rd_party/FlurryAnalytics-4.2.0.jar and /dev/null differ
diff --git a/android/3rd_party/FlurryAnalytics-5.1.0.jar b/android/3rd_party/FlurryAnalytics-5.1.0.jar
new file mode 100755
index 0000000000..9a94bbea45
Binary files /dev/null and b/android/3rd_party/FlurryAnalytics-5.1.0.jar differ
diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt
index df1b7dffc4..ed61deb5f5 100644
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@@ -3,6 +3,8 @@
 -keep class !android.support.v7.internal.view.menu.**,** {*;}
 # ignore warnings from MRGS billing.
 -dontwarn ru.mail.**
+# flurry
+-dontwarn com.flurry.**
 
 -dontoptimize
 -keepattributes **
diff --git a/android/src/com/mapswithme/util/statistics/FlurryEngine.java b/android/src/com/mapswithme/util/statistics/FlurryEngine.java
index df7597e1a4..f9452ddf6b 100644
--- a/android/src/com/mapswithme/util/statistics/FlurryEngine.java
+++ b/android/src/com/mapswithme/util/statistics/FlurryEngine.java
@@ -7,6 +7,7 @@ import android.provider.Settings.Secure;
 import android.util.Log;
 
 import com.flurry.android.FlurryAgent;
+import com.mapswithme.maps.R;
 import com.mapswithme.util.Utils;
 
 public class FlurryEngine extends StatisticsEngine
@@ -24,15 +25,9 @@ public class FlurryEngine extends StatisticsEngine
   @Override
   public void configure(Context context, Bundle params)
   {
-    FlurryAgent.setUseHttps(true);
     FlurryAgent.setUserId(Secure.ANDROID_ID);
-
-    FlurryAgent.setReportLocation(false);
-
-    if (mDebug)
-      FlurryAgent.setLogLevel(Log.DEBUG);
-    else
-      FlurryAgent.setLogLevel(Log.ERROR);
+    FlurryAgent.setLogLevel(mDebug ? Log.DEBUG : Log.ERROR);
+    FlurryAgent.init(context, context.getString(R.string.flurry_app_key));
   }
 
   @Override
@@ -40,7 +35,7 @@ public class FlurryEngine extends StatisticsEngine
   {
     Utils.checkNotNull(mKey);
     Utils.checkNotNull(activity);
-    FlurryAgent.onStartSession(activity, mKey);
+    FlurryAgent.onStartSession(activity);
   }
 
   @Override
@@ -58,5 +53,4 @@ public class FlurryEngine extends StatisticsEngine
     else
       FlurryAgent.logEvent(event.getName());
   }
-
 }
diff --git a/android/src/com/mapswithme/util/statistics/Statistics.java b/android/src/com/mapswithme/util/statistics/Statistics.java
index 4e17d9d6de..66647593b9 100644
--- a/android/src/com/mapswithme/util/statistics/Statistics.java
+++ b/android/src/com/mapswithme/util/statistics/Statistics.java
@@ -3,6 +3,7 @@ package com.mapswithme.util.statistics;
 import android.app.Activity;
 
 import com.mapswithme.country.ActiveCountryTree;
+import com.mapswithme.maps.BuildConfig;
 import com.mapswithme.maps.MWMApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.api.ParsedMmwRequest;
@@ -27,8 +28,7 @@ public enum Statistics
   private List<StatisticsEngine> mStatisticsEngines;
   private EventBuilder mEventBuilder;
 
-  private final boolean DEBUG = false;
-  private final Logger mLogger = DEBUG ? SimpleLogger.get("MwmStatistics") : StubLogger.get();
+  private final Logger mLogger = BuildConfig.DEBUG ? SimpleLogger.get("MwmStatistics") : StubLogger.get();
 
   // Statistics counters
   private int mBookmarksCreated = 0;
@@ -287,7 +287,7 @@ public enum Statistics
         engine.onStartActivity(activity);
 
       if (doCollectStatistics())
-        collectOneTimeStatistics(activity);
+        collectOneTimeStatistics();
     }
   }
 
@@ -304,8 +304,8 @@ public enum Statistics
     final String key = MWMApplication.get().getResources().getString(R.string.flurry_app_key);
     mStatisticsEngines = new ArrayList<>();
 
-    final StatisticsEngine flurryEngine = new FlurryEngine(DEBUG, key);
-    flurryEngine.configure(null, null);
+    final StatisticsEngine flurryEngine = new FlurryEngine(BuildConfig.DEBUG, key);
+    flurryEngine.configure(MWMApplication.get(), null);
     mStatisticsEngines.add(flurryEngine);
 
     mEventBuilder = new EventBuilder();
@@ -320,7 +320,7 @@ public enum Statistics
     }
   }
 
-  private void collectOneTimeStatistics(Activity activity)
+  private void collectOneTimeStatistics()
   {
     mEventBuilder.setName(EventParam.PRO_STAT);