diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index cd300863..26fad890 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -28,6 +28,7 @@ Maintainers (CyanogenMod 9):
 * 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
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 98843730..79f5205a 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -14,6 +14,7 @@ add_lunch_combo cm_hallon-userdebug
 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