diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index a9c40b3..26fad89 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -28,6 +28,7 @@
 * Samsung Galaxy S II AT&T (SGH-I777): atinm, Entropy512
 * Samsung Galaxy S II Skyrocket (SGH-I727): David Ferguson (dferg)
 * Samsung Galaxy S II T-Mobile (SGH-T989): Mike Grissom (mikeyman77)
+* Samsung Galaxy S III (GT-I9300): codeworkx, xplodwild
 * Samsung Galaxy Tab 10.1: cyanogen, pershoot
 * Samsung Galaxy Tab 8.9: kallt_kaffe
 * Samsung Galaxy Tab 7: cdesai, humberos, jt1134
@@ -38,7 +39,7 @@
 Translators:
 ------------
 * German: Matthias Büchner, Alexander Hofbauer, Sebastian K (DerSeppel), Ricco Thiel, Andreas Böhm
-* Italian: Eugenio Ziliotto, Giulio Cervera
+* Italian: Francesco Foresta, Moreno Pojer, Eugenio Ziliotto, Giulio Cervera
 * Japanese: Takuo Kitame
 * French: Sébastien Vaucher, David Girault, Tanguy Pruvot
 * Simplified Chinese: comercy, Qian Zheng
diff --git a/prebuilt/common/etc/apns-conf.xml b/prebuilt/common/etc/apns-conf.xml
index 4959a74..5926116 100644
--- a/prebuilt/common/etc/apns-conf.xml
+++ b/prebuilt/common/etc/apns-conf.xml
@@ -1319,8 +1319,8 @@
   <apn carrier="Movistar AR MMS" mcc="722" mnc="07" apn="mms.gprs.unifon.com.ar" user="mms" password="mms" mmsc="http://movistar.com.ar" mmsproxy="200.68.32.239" mmsport="8080" authenticationtype="PAP" type="mms" />
   <apn carrier="CTI" mcc="722" mnc="310" apn="internet.ctimovil.com.ar" user="guest" password="guest" type="default,supl" />
   <apn carrier="CTI MMS" mcc="722" mnc="310" apn="mms.ctimovil.com.ar" user="ctimms" password="ctimms999" mmsc="http://mms.ctimovil.com.ar" mmsproxy="170.051.255.240" mmsport="9201" type="mms" />
-  <apn carrier="Claro AR" mcc="722" mnc="310" apn="igprs.claro.com.ar" user="ctigprs" password="ctigpr999" type="default,supl" />
-  <apn carrier="Claro AR MMS" mcc="722" mnc="310" apn="mms.ctimovil.com.ar" user="ctimms" password="ctimms999" mmsc="http://mms.ctimovil.com.ar" mmsproxy="170.051.255.240" mmsport="8080" type="mms" />
+  <apn carrier="Claro AR" mcc="722" mnc="310" apn="igprs.claro.com.ar" user="ctigprs" password="ctigpr999" authenticationtype="PAP" type="default,supl" />
+  <apn carrier="Claro AR MMS" mcc="722" mnc="310" apn="mms.ctimovil.com.ar" user="ctimms" password="ctimms999" mmsc="http://mms.ctimovil.com.ar" mmsproxy="170.051.255.240" mmsport="8080" authenticationtype="PAP" type="mms" />
   <apn carrier="Personal" mcc="722" mnc="34" apn="gprs.personal.com" user="gprs" type="default,supl" />
   <apn carrier="Personal MMS" mcc="722" mnc="34" apn="mms" user="mms" password="mms" mmsc="http://mms.personal.com/" mmsproxy="172.025.007.031" mmsport="9201" type="mms" />
   <apn carrier="TIM BR MMS" mcc="724" mnc="02" apn="mms.tim.br" user="tim" password="tim" mmsc="http://mms.tim.br" mmsproxy="200.179.66.242" mmsport="8080" type="mms" />
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 9884373..b440711 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,6 +14,7 @@
 add_lunch_combo cm_hercules-userdebug
 add_lunch_combo cm_i777-userdebug
 add_lunch_combo cm_i9100g-userdebug
+add_lunch_combo cm_i9300-userdebug
 add_lunch_combo cm_iyokan-userdebug
 add_lunch_combo cm_mango-userdebug
 add_lunch_combo cm_maguro-userdebug
@@ -47,3 +48,4 @@
 add_lunch_combo cm_vibrantmtd-userdebug
 add_lunch_combo cm_wingray-userdebug
 add_lunch_combo cm_zeus-userdebug
+add_lunch_combo cm_zeusc-userdebug