diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 42553eeb..78f6908d 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -17,9 +17,10 @@ Maintainers (CyanogenMod 9):
 * LG Optimus LTE / AT&T Nitro HD: arcee
 * Motorola Xoom (stingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)
 * Motorola Xoom (wingray): TDR, Steady Hawkin, Bazar6 (Team Rogue)
-* Samsung Galaxy S (GT-I9000): coolya, codeworkx, atinm, GuiperPT, Unhelpful
-* Samsung Galaxy S II (GT-I9100): atinm, codeworkx, coolya, GuiperPT, Unhelpful
-* Samsung Galaxy S II AT&T (SGH-I777): atinm, Andrew Dodd, codeworkx, coolya, GuiperPT, Unhelpful
+* Samsung Galaxy Note (GT-N7000): Entropy512, xplodwild
+* Samsung Galaxy S (GT-I9000): pawitp
+* Samsung Galaxy S II (GT-I9100): codeworkx, Unhelpful, xplodwild
+* Samsung Galaxy S II AT&T (SGH-I777): atinm, Entropy512
 * 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 688f81e6..10d67f58 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -13,6 +13,7 @@ add_lunch_combo cm_i777-userdebug
 add_lunch_combo cm_iyokan-userdebug
 add_lunch_combo cm_mango-userdebug
 add_lunch_combo cm_maguro-userdebug
+add_lunch_combo cm_n7000-userdebug
 add_lunch_combo cm_p1-userdebug
 add_lunch_combo cm_p1c-userdebug
 add_lunch_combo cm_p3-userdebug