diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 12b99b18..d4e00fa6 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -47,6 +47,7 @@ Maintainers:
 * Jordan (Defy): Quarx, Epsylon3, maniac103
 * Droid2 (MotoA955): JBirdVegas, RevNumbers
 * Galaxy S II (GT-I9100): atinm, codeworkx, coolya, GuiperPT, Unhelpful
+* Galaxy S II AT&T (SGH-I777): atinm, Andrew Dodd, codeworkx, coolya, GuiperPT, Unhelpful
 * Xperia Arc (LT15i): Bin4ry,defer,jerpelea (FreeXperia team)
 * Xperia Neo (MT15i): Bin4ry,defer,jerpelea (FreeXperia team)
 * Xperia Play (R800i): Bin4ry,defer,jerpelea (FreeXperia team)
diff --git a/vendorsetup.sh b/vendorsetup.sh
index 021d2a52..f76305ad 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -6,6 +6,7 @@ add_lunch_combo cm_epicmtd-userdebug
 add_lunch_combo cm_galaxys2-userdebug
 add_lunch_combo cm_haida-userdebug
 add_lunch_combo cm_hallon-userdebug
+add_lunch_combo cm_i777-userdebug
 add_lunch_combo cm_iyokan-userdebug
 add_lunch_combo cm_mango-userdebug
 add_lunch_combo cm_maguro-userdebug