As far as gerim, see Yechezkel 47:22-23:
וְהָיָ֗ה תַּפִּ֣לוּ אוֹתָהּ֮ בְּנַחֲלָה֒ לָכֶ֗ם וּלְהַגֵּרִים֙ הַגָּרִ֣ים בְּתוֹכְכֶ֔ם אֲשֶׁר־הוֹלִ֥דוּ בָנִ֖ים בְּתֽוֹכְכֶ֑ם וְהָי֣וּ לָכֶ֗ם כְּאֶזְרָח֙ בִּבְנֵ֣י יִשְׂרָאֵ֔ל אִתְּכֶם֙ יִפְּל֣וּ בְנַחֲלָ֔ה בְּת֖וֹךְ שִׁבְטֵ֥י יִשְׂרָאֵֽל: וְהָיָ֣ה בַשֵּׁ֔בֶט אֲשֶׁר־גָּ֥ר הַגֵּ֖ר אִתּ֑וֹ שָׁ֚ם תִּתְּנ֣וּ נַחֲלָת֔וֹ
You shall allot it as a heritage for yourselves and for the strangers who reside among you, who have begotten children among you. You shall treat them as Israelite citizens; they shall receive allotments along with you among the tribes of Israel. You shall give the stranger an allotment within the tribe where he resides...
The commentaries there take this at face value, and Abarbanel, in particular, says that it's only fair: since these gerim suffered the pains of galus together with the born Jews, they ought to share in their rewards too. (Although Sifri, cited and commented on in Torah Temimah to Bamidbar 10:29, says that they'll be entitled only to land for burial plots.)
