diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt
index 8d87fe927..2d7954281 100644
--- a/docs/changelog/6.x.x.txt
+++ b/docs/changelog/6.x.x.txt
@@ -92,6 +92,6 @@ webgui.
  - Removed the upgrades older than 4.x in order to help reduce the size of
    the distribution. If you need those old upgrades you can still get them 
    from previous distributions or th 5.5 branch in CVS.
-
+ - Added Job Listing templates to the USS.
 
 
diff --git a/docs/upgrades/upgrade_5.9.9-6.0.0.sql b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
index 1cd18c831..27c3090e1 100644
--- a/docs/upgrades/upgrade_5.9.9-6.0.0.sql
+++ b/docs/upgrades/upgrade_5.9.9-6.0.0.sql
@@ -664,3 +664,9 @@ INSERT INTO template VALUES (1,'Default Search','<tmpl_if displayTitle>\r\n    <
 delete from international where internationalId=365 and namespace='WebGUI';
 delete from international where internationalId=366 and namespace='WebGUI';
 
+
+INSERT INTO template VALUES (14,'Job Listing','<tmpl_if displayTitle>\n    <h1><tmpl_var title></h1>\n</tmpl_if>\n\n<tmpl_if description>\n    <tmpl_var description><p />\n</tmpl_if>\n\n<tmpl_if session.scratch.search>\n <tmpl_var search.form>\n</tmpl_if>\n\n<table width=\"100%\" cellpadding=2 cellspacing=1 border=0><tr>\n<td align=\"right\" class=\"tableMenu\">\n\n<tmpl_if canPost>\n   <a href=\"<tmpl_var post.url>\">Add a job.</a> &middot;\n</tmpl_if>\n\n<a href=\"<tmpl_var search.url>\"><tmpl_var search.label></a>\n\n</td></tr></table>\n\n<table width=\"100%\" cellspacing=1 cellpadding=2 border=0>\n<tr>\n<td class=\"tableHeader\">Job Title</td>\n<td class=\"tableHeader\">Location</td>\n<td class=\"tableHeader\">Compensation</td>\n<td class=\"tableHeader\">Date Posted</td>\n</tr>\n\n<tmpl_loop submissions_loop>\n\n<tr>\n<td class=\"tableData\">\n     <a href=\"<tmpl_var submission.URL>\">  <tmpl_var submission.title>\n</td>\n<td class=\"tableData\"><tmpl_var submission.userDefined2></td>\n<td class=\"tableData\"><tmpl_var submission.userDefined1></td>\n<td class=\"tableData\"><tmpl_var submission.date></td>\n</tr>\n\n</tmpl_loop>\n\n</table>\n\n<tmpl_if multiplePages>\n  <div class=\"pagination\">\n    <tmpl_var previousPage>  &middot; <tmpl_var pageList> &middot; <tmpl_var nextPage>\n  </div>\n</tmpl_if>\n','USS');
+INSERT INTO template VALUES (2,'Job','<h1><tmpl_var title></h1>\n\n<tmpl_if content>\n<p>\n<b>Job Description</b><br />\n<tmpl_var content>\n</p>\n</tmpl_if>\n\n<tmpl_if userDefined3.value>\n<p>\n<b>Job Requirements</b><br />\n<tmpl_var userDefined3.value>\n</p>\n</tmpl_if>\n\n<table>\n<tr>\n  <td class=\"tableHeader\">Date Posted</td>\n  <td class=\"tableData\"><tmpl_var date.human></td>\n</tr>\n<tr>\n  <td  class=\"tableHeader\">Location</td>\n  <td class=\"tableData\"><tmpl_var userDefined2.value></td>\n</tr>\n<tr>\n  <td  class=\"tableHeader\">Compensation</td>\n  <td class=\"tableData\"><tmpl_var userDefined1.value></td>\n</tr>\n<tr>\n  <td  class=\"tableHeader\">Views</td>\n  <td class=\"tableData\"><tmpl_var views.count></td>\n</tr>\n</table>\n\n<p>\n<tmpl_if previous.more>\n   <a href=\"<tmpl_var previous.url>\">&laquo; Previous Job</a> &middot;\n</tmpl_if>\n<a href=\"<tmpl_var back.url>\">List All Jobs</a>\n<tmpl_if next.more>\n   &middot; <a href=\"<tmpl_var next.url>\">Next Job &raquo;</a>\n</tmpl_if>\n</p>\n\n\n<tmpl_if canEdit>\n<p>\n   <a href=\"<tmpl_var edit.url>\">Edit</a>\n   &middot;\n   <a href=\"<tmpl_var delete.url>\"><tmpl_var delete.label></a>\n</p>\n</tmpl_if>\n\n<tmpl_if canChangeStatus>\n <p>\n<b>Status:</b> <tmpl_var status.status> ||\n   <a href=\"<tmpl_var approve.url>\"><tmpl_var approve.label></a>\n   &middot;\n   <a href=\"<tmpl_var deny.url>\"><tmpl_var deny.label></a>\n </p>\n</tmpl_if>\n\n\n\n','USS/Submission');
+INSERT INTO template VALUES (4,'Job Submission Form','<h1>Edit Job Posting</h1>\n\n<tmpl_var form.header>\n<input type=\"hidden\" name=\"contentType\" value=\"html\" />\n	<table>\n	<tmpl_if user.isVisitor> <tmpl_if submission.isNew>\n		<tr><td><tmpl_var visitorName.label></td><td><tmpl_var visitorName.form></td></tr>\n	</tmpl_if> </tmpl_if>\n	<tr><td>Job Title</td><td><tmpl_var title.form></td></tr>\n	<tr><td>Job Description</td><td><tmpl_var body.form></td></tr>\n	<tr><td>Job Requirements</td><td><tmpl_var userDefined3.form.htmlarea></td></tr>\n	<tr><td>Compensation</td><td><tmpl_var userDefined1.form></td></tr>\n	<tr><td>Location</td><td><tmpl_var userDefined2.form></td></tr>\n	<tr><td></td><td><tmpl_var form.submit></td></tr>\n	</table>\n<tmpl_var form.footer>\n','USS/SubmissionForm');
+
+
diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm
index 8aa40368f..e2681fd88 100644
--- a/lib/WebGUI/Wobject/USS.pm
+++ b/lib/WebGUI/Wobject/USS.pm
@@ -489,6 +489,26 @@ sub www_editSubmission {
 		name=>"userDefined5",
 		value=>$submission->{userDefined5}
 		});
+	$var{'userDefined1.form.htmlarea'} = WebGUI::Form::HTMLArea({
+		name=>"userDefined1",
+		value=>$submission->{userDefined1}
+		});
+	$var{'userDefined2.form.htmlarea'} = WebGUI::Form::HTMLArea({
+		name=>"userDefined2",
+		value=>$submission->{userDefined2}
+		});
+	$var{'userDefined3.form.htmlarea'} = WebGUI::Form::HTMLArea({
+		name=>"userDefined3",
+		value=>$submission->{userDefined3}
+		});
+	$var{'userDefined4.form.htmlarea'} = WebGUI::Form::HTMLArea({
+		name=>"userDefined4",
+		value=>$submission->{userDefined4}
+		});
+	$var{'userDefined5.form.htmlarea'} = WebGUI::Form::HTMLArea({
+		name=>"userDefined5",
+		value=>$submission->{userDefined5}
+		});
 	$var{'userDefined1.value'} = $submission->{userDefined1};
 	$var{'userDefined2.value'} = $submission->{userDefined2};
 	$var{'userDefined3.value'} = $submission->{userDefined3};