diff --git a/CONTRIBUTORS.mkdn b/CONTRIBUTORS.mkdn
index 67a3240..3f31784 100644
--- a/CONTRIBUTORS.mkdn
+++ b/CONTRIBUTORS.mkdn
@@ -95,11 +95,13 @@
 * __Sony Xperia V (tsubasa):__ jerpelea, Kali- (FreeXperia team), codeworkx, tilal6991, championswimmer
 * __Sony Xperia Z (yuga):__ jerpelea, Kali- (FreeXperia team), cdesai, codeworkx, championswimmer
 * __Sony Xperia ZL (odin):__ jerpelea, Kali- (FreeXperia team), championswimmer
-* __Sony Xperia ZR (dogo):__ jerpelea, Kali- (FreeXperia team)
+* __Sony Xperia ZR (dogo):__ jerpelea, Kali- (FreeXperia team), championswimmer
 * __Sony Xperia Tablet Z LTE (pollux):__ jerpelea, Kali- (FreeXperia team), codeworkx
 * __Sony Xperia Tablet Z Wifi (pollux_windy):__ jerpelea, Kali- (FreeXperia team), Bumble-Bee
 * __Sony Xperia Z Ultra (togari):__ jerpelea, Kali- (FreeXperia team)
-* __Sony Xperia Z1 (honami):__ jerpelea, Kali- (FreeXperia team)
+* __Sony Xperia Z1 (honami):__ jerpelea, Kali- (FreeXperia team), cdesai
+* __Sony Xperia Z1 compact (amami):__ jerpelea, Kali- (FreeXperia team), intervigil, championswimmer, Bumble-Bee
+* __Sony Z Ultra GPE (togari_gpe):__ jerpelea, Kali- (FreeXperia team), cdesai
 
 
 General developers:
diff --git a/config/common_full.mk b/config/common_full.mk
index 9f51f80..ffdb2da 100644
--- a/config/common_full.mk
+++ b/config/common_full.mk
@@ -31,6 +31,13 @@
     libvideoeditor_videofilters \
     libvideoeditorplayer
 
+# Stagefright FFMPEG plugin
+PRODUCT_PACKAGES += \
+    libstagefright_soft_ffmpegadec \
+    libstagefright_soft_ffmpegvdec \
+    libFFmpegExtractor \
+    libnamparser
+
 # Extra tools in CM
 PRODUCT_PACKAGES += \
     vim
diff --git a/prebuilt/common/etc/spn-conf.xml b/prebuilt/common/etc/spn-conf.xml
index 82e16a0..3dc3934 100644
--- a/prebuilt/common/etc/spn-conf.xml
+++ b/prebuilt/common/etc/spn-conf.xml
@@ -2,6 +2,7 @@
 
 <spnOverrides>
   <!-- Japan -->
+  <spnOverride numeric="44010" spn_display_rule="SPN_RULE_SHOW_PLMN" spn_override_only_on="44010"/>
   <spnOverride numeric="44020" spn="SoftBank" />
   <!-- Hong Kong -->
   <spnOverride numeric="45406" spn="SmarTone" />