diff --git a/CHANGELOG.mkdn b/CHANGELOG.mkdn
index 1b04ba2d..b9900dc1 100644
--- a/CHANGELOG.mkdn
+++ b/CHANGELOG.mkdn
@@ -54,7 +54,8 @@ Maintainers:
 * V9 (ZTE Light, Optus MyTab, others): kallt_kaffe and Tom Giordano
 * Motus (Backflip) : j_r0dd, flavio_frow
 * Saga (Desire S): Nexx
-* Galaxy Tab 10.1 : cyanogen, pershoot
+* Galaxy Tab 10.1: cyanogen, pershoot
+* Galaxy Tab 8.9: kallt_kaffe
 
 Translators:
 ------------
diff --git a/vendorsetup.sh b/vendorsetup.sh
index cc86d882..e458f4f7 100644
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -6,6 +6,8 @@ add_lunch_combo cm_maguro-userdebug
 add_lunch_combo cm_p4tmo-userdebug
 add_lunch_combo cm_p4vzw-userdebug
 add_lunch_combo cm_p4wifi-userdebug
+add_lunch_combo cm_p5-userdebug
+add_lunch_combo cm_p5wifi-userdebug
 add_lunch_combo cm_p920-userdebug
 add_lunch_combo cm_p970-userdebug
 add_lunch_combo cm_p990-userdebug