diff --git a/src/util/strftime.spec.ts b/src/util/strftime.spec.ts
index 04082e7cc..af8b242f2 100644
--- a/src/util/strftime.spec.ts
+++ b/src/util/strftime.spec.ts
@@ -18,6 +18,14 @@ describe('util/strftime', function () {
     it('should format %y as 2-digit year', function () {
       expect(t(now, '%y')).toBe('16')
     })
+    it('should format %C and %y from the numeric year', function () {
+      const year999 = new TestDate('0999-06-15 00:00:00')
+      expect(t(year999, '%C')).toBe('09')
+      expect(t(year999, '%y')).toBe('99')
+      const year2005 = new TestDate('2005-06-15 00:00:00')
+      expect(t(year2005, '%y')).toBe('05')
+      expect(t(year2005, '%-y')).toBe('5')
+    })
     describe('%j', function () {
       it('should format %j as day of year', function () {
         expect(t(then, '%j')).toBe('066')
diff --git a/src/util/strftime.ts b/src/util/strftime.ts
index 2ebe2c4f5..5725ccbca 100644
--- a/src/util/strftime.ts
+++ b/src/util/strftime.ts
@@ -43,11 +43,12 @@ function ordinal (d: LiquidDate) {
   }
 }
 function century (d: LiquidDate) {
-  return parseInt(d.getFullYear().toString().substring(0, 2), 10)
+  return Math.floor(d.getFullYear() / 100)
 }
 
 // default to 0
 const padWidths: Record<string, number> = {
+  C: 2,
   d: 2,
   e: 2,
   H: 2,
@@ -60,7 +61,8 @@ const padWidths: Record<string, number> = {
   M: 2,
   S: 2,
   U: 2,
-  W: 2
+  W: 2,
+  y: 2
 }
 
 const padSpaceChars = new Set('aAbBceklpP')
@@ -110,7 +112,7 @@ const formatCodes: Record<string, FormatCodeHandler> = {
   W: (d: LiquidDate) => getWeekOfYear(d, 1),
   x: (d: LiquidDate) => d.toLocaleDateString(),
   X: (d: LiquidDate) => d.toLocaleTimeString(),
-  y: (d: LiquidDate) => d.getFullYear().toString().slice(2, 4),
+  y: (d: LiquidDate) => (d.getFullYear() % 100 + 100) % 100,
   Y: (d: LiquidDate) => d.getFullYear(),
   z: getTimezoneOffset,
   Z: (d: LiquidDate, opts: FormatOptions) => d.getTimeZoneName() || getTimezoneOffset(d, opts),