diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index eac4576e55..4de3a5068d 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -171,8 +171,8 @@
     <activity
         android:name="com.mapswithme.maps.MWMActivity"
         android:launchMode="singleTask"
-        android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
-        android:theme="@style/MwmTheme.Map">
+        android:theme="@style/MwmTheme.Map"
+        android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
     </activity>
 
     <activity
@@ -323,6 +323,25 @@
         <category android:name="${applicationId}"/>
       </intent-filter>
     </receiver>
+
+    <!-- Catches app upgraded intent.
+         Different receivers are used due to MY_PACKAGE_REPLACED was added in Honeycomb_MR1-->
+    <receiver android:name=".background.UpgradeReceiver"
+              android:enabled="@bool/isNewerThanHoneycombMr1">
+      <intent-filter>
+        <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
+      </intent-filter>
+    </receiver>
+
+    <receiver android:name=".background.UpgradeReceiverCompat"
+              android:enabled="@bool/isOlderThanHoneycombMr1">
+      <intent-filter>
+        <action android:name="android.intent.action.PACKAGE_REPLACED"/>
+
+        <data android:scheme="package"/>
+      </intent-filter>
+    </receiver>
+
   </application>
 
 </manifest>
diff --git a/android/res/values-v12/version-checks.xml b/android/res/values-v12/version-checks.xml
new file mode 100644
index 0000000000..8d8db2740f
--- /dev/null
+++ b/android/res/values-v12/version-checks.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="isNewerThanHoneycombMr1">true</bool>
+  <bool name="isOlderThanHoneycombMr1">false</bool>
+</resources>
\ No newline at end of file
diff --git a/android/res/values/version-checks.xml b/android/res/values/version-checks.xml
new file mode 100644
index 0000000000..75c5263dcb
--- /dev/null
+++ b/android/res/values/version-checks.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <bool name="isNewerThanHoneycombMr1">false</bool>
+  <bool name="isOlderThanHoneycombMr1">true</bool>
+</resources>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/background/UpgradeReceiver.java b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java
new file mode 100644
index 0000000000..839a038c80
--- /dev/null
+++ b/android/src/com/mapswithme/maps/background/UpgradeReceiver.java
@@ -0,0 +1,14 @@
+package com.mapswithme.maps.background;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class UpgradeReceiver extends BroadcastReceiver
+{
+  @Override
+  public void onReceive(Context context, Intent intent)
+  {
+    // TODO our package's updated, do smth
+  }
+}
diff --git a/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java b/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java
new file mode 100644
index 0000000000..979ea771dd
--- /dev/null
+++ b/android/src/com/mapswithme/maps/background/UpgradeReceiverCompat.java
@@ -0,0 +1,17 @@
+package com.mapswithme.maps.background;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class UpgradeReceiverCompat extends BroadcastReceiver
+{
+  @Override
+  public void onReceive(Context context, Intent intent)
+  {
+    if (context.getPackageName().equals(intent.getData().getSchemeSpecificPart()))
+    {
+      // TODO our package's updated, do smth
+    }
+  }
+}