diff --git a/font-src/glyphs/auto-build/transformed.ptl b/font-src/glyphs/auto-build/transformed.ptl
index 7b23e87b8..0603cfb03 100644
--- a/font-src/glyphs/auto-build/transformed.ptl
+++ b/font-src/glyphs/auto-build/transformed.ptl
@@ -192,8 +192,8 @@ glyph-block Autobuild-Transformed : begin
 		link-relations relSets
 
 	createSuperscripts : list
-		list 0x00AA 'aUnderlineBelow'
-		list 0x00BA 'oUnderlineBelow'
+		list 0x00AA 'aSbRsbUnderlineBelow'
+		list 0x00BA 'oSbRsbUnderlineBelow'
 		list 0x2070 'zero.lnum'
 		list 0x00B9 'one.lnum'
 		list 0x00B2 'two.lnum'
diff --git a/font-src/glyphs/letter/latin/lower-a.ptl b/font-src/glyphs/letter/latin/lower-a.ptl
index 564d3dd65..35f9c28bd 100644
--- a/font-src/glyphs/letter/latin/lower-a.ptl
+++ b/font-src/glyphs/letter/latin/lower-a.ptl
@@ -231,4 +231,4 @@ glyph-block Letter-Latin-Lower-A : begin
 		if SLAB : include : tagged 'serifRT' : RightwardTopSerif RightSB XH SideJut
 
 	CreateAccentedComposition 'aDieresis' 0xE4 'a' 'dieresisAbove'
-	CreateAccentedComposition 'aUnderlineBelow' null 'a' 'underlineBelow'
+	CreateAccentedComposition 'aSbRsbUnderlineBelow' null 'a' 'sbRsbUnderlineBelow'
diff --git a/font-src/glyphs/letter/latin/o.ptl b/font-src/glyphs/letter/latin/o.ptl
index aee33d669..4061dd926 100644
--- a/font-src/glyphs/letter/latin/o.ptl
+++ b/font-src/glyphs/letter/latin/o.ptl
@@ -179,4 +179,4 @@ glyph-block Letter-Latin-O : begin
 		include : OShape XH [Math.max (Stroke * 1.5) (CAP * 0.1)] SB RightSB Stroke SmoothA SmoothB
 		include : HBarBottom SB RightSB 0
 
-	CreateAccentedComposition 'oUnderlineBelow' null 'o' 'underlineBelow'
+	CreateAccentedComposition 'oSbRsbUnderlineBelow' null 'o' 'sbRsbUnderlineBelow'
diff --git a/font-src/glyphs/marks/index.ptl b/font-src/glyphs/marks/index.ptl
index 1130adac2..31ddae927 100644
--- a/font-src/glyphs/marks/index.ptl
+++ b/font-src/glyphs/marks/index.ptl
@@ -350,6 +350,16 @@ glyph-block Marks : begin
 			flat (0 - Width) (XH + Accent) [widths markHalfStroke markHalfStroke]
 			curl 0           (XH + Accent)
 
+	create-glyph 'sbRsbOverlineAbove' : glyph-proc
+		set-width 0
+		currentGlyph.shortName = 'overline'
+		set-mark-anchor 'above' markMiddle XH markMiddle aboveMarkTop
+		set-base-anchor 'aboveBrace' markMiddle (XH + Accent)
+
+		include : dispiro
+			flat (SB - Width)      (XH + Accent) [widths markHalfStroke markHalfStroke]
+			curl (RightSB - Width) (XH + Accent)
+
 	create-glyph 'dblOverlineAbove' 0x33F : glyph-proc
 		set-width 0
 		set-mark-anchor 'above' markMiddle XH markMiddle aboveMarkTop
@@ -1058,6 +1068,7 @@ glyph-block Marks : begin
 	TurnAboveMarkToBelow 'dblRingBelow' 0x35a 'dblRingAbove'
 	TurnAboveMarkToBelow 'lrArrowBelow' 0x34D 'lrArrowAbove'
 	TurnAboveMarkToBelow 'upArrowBelow' 0x34E 'downArrowAbove'
+	TurnAboveMarkToBelow 'sbRsbUnderlineBelow' 0x332 'sbRsbOverlineAbove'
 
 	create-glyph 'greaterAndUpArrowheadBelow' 0x0356 : glyph-proc
 		set-width 0