diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index da3c8dbd..8f552c6d 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -8,19 +8,15 @@
   <head>
   	<script language="javascript">
   	  function offsetDate(id, offset) {
-	    var date = new Date();
-	    var dateOffset = new Date(
-		  Date.UTC(
-		  	date.getFullYear(),
-		    date.getMonth(),
-			date.getDate(),
-			date.getHours(),
-			date.getMinutes(),
-			date.getSeconds()
-		  ) + (offset - 20) *60*60*1000);
 
-	    document.getElementById(id).innerHTML = dateOffset;
-      }
+            var now = new Date() ;
+            var nowTime = now.getTime() ;
+            var localOffset = now.getTimezoneOffset() ;
+            var developerTime = nowTime + (offset * 60 * 60 * 1000) + (localOffset * 60 * 1000) ;
+            var developerDate = new Date(developerTime) ;
+
+            document.getElementById(id).innerHTML = developerDate;
+          }
   	
   	  function init() {
 	    #foreach ($developer in $project.developers)
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index e54c62af..bae79716 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -7,6 +7,9 @@
 
   <body>
     <release version="1.5" date="in CVS">
+      <action dev="dion" type="update">
+        Fix MAVEN-962. Better timezone calcs.
+      </action>
       <action dev="dion" type="update">
         Fix MAVEN-961. Bad docs entries for maven.docs.dest and maven.gen.docs.
       </action>
