diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da
index 2b2b9c87..6d792684 100644
--- a/nwn/nwnprc/trunk/2das/feat.2da
+++ b/nwn/nwnprc/trunk/2das/feat.2da
@@ -3555,12 +3555,12 @@
 3551 Augment_Digits_0_4 16823584 16823583 ife_augment_0_4 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2351 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_AUGMENT_PSIONICS_DIGITS_0_4 4 **** **** **** **** **** 0 0
 3552 Augment_Digits_5_9 16823585 16823583 ife_augment_5_9 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2352 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_AUGMENT_PSIONICS_DIGITS_5_9 4 **** **** **** **** **** 0 0
 3553 Augment_Tens 16823586 16823583 ife_augment_0_40 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2353 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_AUGMENT_PSIONICS_TENS 4 **** **** **** **** **** 0 0
-3554 PSION_DIS_EGOIST 16823593 16823594 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_EGOIST 4 **** **** **** **** **** 0 1
-3555 PSION_DIS_KINETICIST 16823595 16823596 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_KINETICIST 4 **** **** **** **** **** 0 1
-3556 PSION_DIS_NOMAD 16823597 16823598 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_NOMAD 4 **** **** **** **** **** 0 1
-3557 PSION_DIS_SEER 16823599 16823600 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_SEER 4 **** **** **** **** **** 0 1
-3558 PSION_DIS_SHAPER 16823601 16823602 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_SHAPER 4 **** **** **** **** **** 0 1
-3559 PSION_DIS_TELEPATH 16823603 16823604 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** **** **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_TELEPATH 4 **** **** **** **** **** 0 1
+3554 PSION_DIS_EGOIST 16823593 16823594 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_EGOIST 4 **** **** **** **** **** 0 1
+3555 PSION_DIS_KINETICIST 16823595 16823596 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_KINETICIST 4 **** **** **** **** **** 0 1
+3556 PSION_DIS_NOMAD 16823597 16823598 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_NOMAD 4 **** **** **** **** **** 0 1
+3557 PSION_DIS_SEER 16823599 16823600 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_SEER 4 **** **** **** **** **** 0 1
+3558 PSION_DIS_SHAPER 16823601 16823602 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_SHAPER 4 **** **** **** **** **** 0 1
+3559 PSION_DIS_TELEPATH 16823603 16823604 rw_specialistdef **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** **** **** 1 **** 124 **** **** **** **** **** **** **** **** **** **** FEAT_PSION_DIS_TELEPATH 4 **** **** **** **** **** 0 1
 3560 Wilder_WildSurge_1-5 16824019 16823611 ife_wildsurge_r1 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2378 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_WILDER_WILDSURGE_1_5 4 **** **** **** **** **** 0 0
 3561 Wilder_WildSurge_6-10 16824020 16823611 ife_wildsurge_r2 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2379 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_WILDER_WILDSURGE_6_10 4 **** **** **** **** **** 0 0
 3562 Wilder_WildSurge_11 16824025 16823611 ife_wildsurge_11 **** **** **** **** **** **** **** **** **** **** 0 0 0 **** **** 2390 **** 0 -1 **** 1 **** **** **** **** **** **** **** **** **** FEAT_WILDER_WILDSURGE_11 4 **** **** **** **** **** 0 0
diff --git a/nwn/nwnprc/trunk/2das/masterfeats.2da b/nwn/nwnprc/trunk/2das/masterfeats.2da
index 27b7ce53..a7dfcb4e 100644
--- a/nwn/nwnprc/trunk/2das/masterfeats.2da
+++ b/nwn/nwnprc/trunk/2das/masterfeats.2da
@@ -125,5 +125,5 @@
 121        ****                  ****     ****        ****             
 122        ****                  ****     ****        ****             
 123        ****                  ****     ****        ****             
-124        ****                  ****     ****        ****             
+124        PsionDiscipline       16854428 16854429    ife_psifeats     
 125        PrCMarkerFeats        16854426 16854427    ife_magic        
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk
index b6c40710..038a2bf6 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
index 2ec6733d..36538058 100644
--- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
@@ -73143,7 +73143,9 @@ Special Abilities:
   <entry id="77208" lang="en" sex="m">Sorcerous Spellcasting (Hobgoblin Warsoul)</entry>
   <entry id="77209" lang="en" sex="m">Sorcerous Casting: Hobgoblin Warsoul's cast spells as a Sorcerer of their hit dice (10th level).</entry>
   <entry id="77210" lang="en" sex="m">&lt;cÿÿÿ&gt;Pick a spellcasting feat (1st lvl)&lt;/c&gt;</entry>
-  <entry id="77211" lang="en" sex="m">Choose which spellcasting class to advance with the currently selected Prestige Class.  If you try take a marker feat after 1st class level, you will be releveled.</entry>
+  <entry id="77211" lang="en" sex="m">Choose which spellcasting class to advance with the currently selected Prestige Class.  If you try take a marker feat after 1st class level, your character will be releveled.</entry>
+  <entry id="77212" lang="en" sex="m">&lt;cÿÿÿ&gt;Chose a Discipline (1st lvl)&lt;/c&gt;</entry> 
+  <entry id="77213" lang="en" sex="m">Every Psion must decide at first level which discipline he will specialize in. Choosing a discipline provides a psion with access to the powers that are restricted to that discipline. If you try take a more than one psionic disipline, your character will be releveled.  If you do this at first character level, you will need to delete the character and start over.</entry>  
   <entry id="79999" lang="en" sex="m">## iprp_damagecost.2da expansion ##</entry>
   <entry id="80000" lang="en" sex="m">21 Damage</entry>
   <entry id="80001" lang="en" sex="m">+21</entry>
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk
index b6c40710..038a2bf6 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk differ