--- common.inc.orig     2007-12-21 11:30:00.979219418 +0700
+++ common.inc  2007-12-21 11:28:21.795715583 +0700
@@ -1092,7 +1092,14 @@
     if (strpos('AaDFlM', $c) !== FALSE) {
       $date .= t(gmdate($c, $timestamp));
     }
-    else if (strpos('BdgGhHiIjLmnsStTUwWYyz', $c) !== FALSE) {
+    else if (strpos('Yy', $c) !== FALSE) {
+      $y = strftime('%Ey', $timestamp);
+      if ($c == 'y') {
+        $y .= substr($y, -2);
+      }
+      $date .= $y;
+    }
+    else if (strpos('BdgGhHiIjLmnsStTUwWz', $c) !== FALSE) {
       $date .= gmdate($c, $timestamp);
     }
     else if ($c == 'r') {