diff --git a/addons/pointwatch/ReadMe.txt b/addons/pointwatch/ReadMe.txt
index a764f37d1..4616a8c47 100644
--- a/addons/pointwatch/ReadMe.txt
+++ b/addons/pointwatch/ReadMe.txt
@@ -30,7 +30,11 @@ Here are the available values:
 * xp.tnl                  = Number of Experience Points in your current level (number from 500 to 56,000)
 * xp.rate                 = Current XP gain rate per hour. This is calculated over a 10 minute window and requires at least two gains within the window.
 * xp.total                = Total Experience Points gained since the last time the addon was loaded (number)
+* xp.job                  = Your current main job.
+* xp.job_abbr             = The three-letter abbreviation of your current main job.
 * xp.job_level            = Level of your current job.
+* xp.sub_job              = Your current subjob.
+* xp.sub_job_abbr         = The three-letter abbreviation of your current subjob.
 * xp.sub_job_level        = Level of your current support job.
 
 * lp.current              = Current Experience Points (number from 0 to 55,999 XP)
diff --git a/addons/pointwatch/pointwatch.lua b/addons/pointwatch/pointwatch.lua
index 7911e0678..ae08bd793 100644
--- a/addons/pointwatch/pointwatch.lua
+++ b/addons/pointwatch/pointwatch.lua
@@ -36,12 +36,15 @@ require('chat')
 
 _addon.name = 'PointWatch'
 _addon.author = 'Byrth'
-_addon.version = 0.220312
+_addon.version = 0.220327
 _addon.command = 'pw'
 
 settings = config.load('data\\settings.xml',default_settings)
 config.register(settings,initialize)
 
+lang = windower.ffxi.get_info().language:sub(1, 2):lower()
+langs = lang.."s"
+
 box = texts.new('${current_string}',settings.text_box_settings,settings)
 box.current_string = ''
 box:show()
@@ -114,7 +117,11 @@ packet_handlers = {
         local p = packets.parse('incoming',org)
         xp.current = p['Current EXP']
         xp.tnl = p['Required EXP']
+        xp.job = res.jobs[p['Main Job']][lang]
+        xp.job_abbr = res.jobs[p['Main Job']][langs]
         xp.job_level = p['Main Job Level']
+        xp.sub_job = res.jobs[p['Sub Job']][lang]
+        xp.sub_job_abbr = res.jobs[p['Sub Job']][langs]
         xp.sub_job_level = p['Sub Job Level']
         accolades.current = p['Unity Points']
         ep.current = p['Current Exemplar Points']
diff --git a/addons/pointwatch/statics.lua b/addons/pointwatch/statics.lua
index af146494d..99a199baa 100644
--- a/addons/pointwatch/statics.lua
+++ b/addons/pointwatch/statics.lua
@@ -81,7 +81,6 @@ other_table = {Crimson=10,Azure=10,Amber=10,Alabaster=10,Obsidian=20}
 dynamis_map = {[185]=city_table,[186]=city_table,[187]=city_table,[188]=city_table,
     [134]=other_table,[135]=other_table,[39]=other_table,[40]=other_table,[41]=other_table,[42]=other_table}
 
-    
 -- Not technically static, but sets the initial values for all features:
 function initialize()
     cp = {
@@ -101,7 +100,11 @@ function initialize()
         rate = 0,
         current = 0,
         tnl = 0,
+        job = 0,
+        job_abbr = 0,
         job_level = 0,
+        sub_job = 0,
+        sub_job_abbr = 0,
         sub_job_level = 0,
     }