diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 88390ee..1b04ba2 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -53,7 +53,7 @@
 * Droid2we (Droid2 Global): RevNumbers, x13thangelx
 * V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
 * Motus (Backflip) : j_r0dd, flavio_frow
-* Saga (Desire S): Nexx, SuperKid
+* Saga (Desire S): Nexx
 * Galaxy Tab 10.1 : cyanogen, pershoot
 
 Translators:
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 68d233a..b8ef606 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -73,6 +73,8 @@
   <apn carrier="ACCESS DATA" mcc="208" mnc="13" apn="websfr" type="default,supl" />
   <apn carrier="NRJ Mobile FR" mcc="208" mnc="10" apn="fnetnrj" type="default,supl" />
   <apn carrier="NRJ Mobile FR MMS" mcc="208" mnc="10" apn="mmsnrj" mmsproxy="010.143.156.005" mmsport="8080" mmsc="http://mmsnrj" type="mms" />
+  <apn carrier="Free Mobile" mcc="208" mnc="15" apn="free" type="default,supl" />
+  <apn carrier="Free Mobile MMS" mcc="208" mnc="15" apn="mmsfree" mmsc="http://mms.free.fr" type="mms" />
   <apn carrier="Bouygues Pro" mcc="208" mnc="20" apn="a2bouygtel.com" type="default,supl,mms" />
   <apn carrier="Bouygues WEB" mcc="208" mnc="20" apn="mmsbouygtel.com" server="*" type="default,supl" />
   <apn carrier="Bouygues Telecom" mcc="208" mnc="20" apn="mmsbouygtel.com" mmsc="http://mms.bouyguestelecom.fr/mms/wapenc" mmsproxy="62.201.129.226" mmsport="8080" type="default,supl,mms" />
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 6898da3..90d03c1 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -9,6 +9,7 @@
 add_lunch_combo cm_p990-userdebug
 add_lunch_combo cm_p999-userdebug
 add_lunch_combo cm_pyramid-userdebug
+add_lunch_combo cm_shooter-userdebug
 add_lunch_combo cm_smb_a1011-userdebug
 add_lunch_combo cm_toro-userdebug
 add_lunch_combo cm_wingray-userdebug