diff --git a/packages/@react-spectrum/s2/src/Tooltip.tsx b/packages/@react-spectrum/s2/src/Tooltip.tsx
index bc27615475c..95e07643f91 100644
--- a/packages/@react-spectrum/s2/src/Tooltip.tsx
+++ b/packages/@react-spectrum/s2/src/Tooltip.tsx
@@ -101,6 +101,9 @@ const tooltip = style<TooltipRenderProps & {colorScheme: ColorScheme | 'light da
   opacity: {
     isEntering: 0,
     isExiting: 0
+  },
+  overflowWrap: {
+    default: 'break-word'
   }
 });
 
diff --git a/packages/@react-spectrum/s2/style/properties.json b/packages/@react-spectrum/s2/style/properties.json
index b026a1fc374..a5ddf107b90 100644
--- a/packages/@react-spectrum/s2/style/properties.json
+++ b/packages/@react-spectrum/s2/style/properties.json
@@ -166,7 +166,8 @@
     "touchAction": "__X",
     "translate": "__Y",
     "wordBreak": "__Z",
-    "--fs": "__0"
+    "overflowWrap": "__0",
+    "--fs": "__1"
   },
   "values": {
     "--iconPrimary": {
@@ -2157,6 +2158,11 @@
       "keep-all": "b",
       "normal": "c"
     },
+    "overflowWrap": {
+      "normal": "a",
+      "anywhere": "b",
+      "break-word": "c"
+    },
     "--fs": {
       "pow(1.125, -2)": "a",
       "pow(1.125, -1)": "b",
diff --git a/packages/@react-spectrum/s2/style/spectrum-theme.ts b/packages/@react-spectrum/s2/style/spectrum-theme.ts
index 52392129b0c..0e8b732c35a 100644
--- a/packages/@react-spectrum/s2/style/spectrum-theme.ts
+++ b/packages/@react-spectrum/s2/style/spectrum-theme.ts
@@ -828,7 +828,8 @@ export const style = createTheme({
     hyphens: ['none', 'manual', 'auto'] as const,
     whiteSpace: ['normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'break-spaces'] as const,
     textWrap: ['wrap', 'nowrap', 'balance', 'pretty'] as const,
-    wordBreak: ['normal', 'break-all', 'keep-all'] as const, // also overflowWrap??
+    wordBreak: ['normal', 'break-all', 'keep-all'] as const,
+    overflowWrap: ['normal', 'anywhere', 'break-word'] as const,
     boxDecorationBreak: ['slice', 'clone'] as const,
 
     // effects
diff --git a/packages/@react-spectrum/style-macro-s1/src/spectrum-theme.ts b/packages/@react-spectrum/style-macro-s1/src/spectrum-theme.ts
index 2617d0ca528..7b8b1073fe3 100644
--- a/packages/@react-spectrum/style-macro-s1/src/spectrum-theme.ts
+++ b/packages/@react-spectrum/style-macro-s1/src/spectrum-theme.ts
@@ -703,7 +703,8 @@ export const style = createTheme({
     hyphens: ['none', 'manual', 'auto'] as const,
     whiteSpace: ['normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'break-spaces'] as const,
     textWrap: ['wrap', 'nowrap', 'balance', 'pretty'] as const,
-    wordBreak: ['normal', 'break-all', 'keep-all'] as const, // also overflowWrap??
+    wordBreak: ['normal', 'break-all', 'keep-all'] as const,
+    overflowWrap: ['normal', 'anywhere', 'break-word'] as const,
     boxDecorationBreak: ['slice', 'clone'] as const,
 
     // effects
diff --git a/packages/dev/codemods/src/s1-to-s2/src/codemods/shared/unsafeStyle.ts b/packages/dev/codemods/src/s1-to-s2/src/codemods/shared/unsafeStyle.ts
index 8be657d42b0..1803d44f2d1 100644
--- a/packages/dev/codemods/src/s1-to-s2/src/codemods/shared/unsafeStyle.ts
+++ b/packages/dev/codemods/src/s1-to-s2/src/codemods/shared/unsafeStyle.ts
@@ -365,6 +365,7 @@ function handleProperty(element: string, property: string, value: t.ObjectProper
     case 'whiteSpace':
     case 'textWrap':
     case 'wordBreak':
+    case 'overflowWrap':
     case 'boxDecorationBreak':
     case 'forcedColorAdjust':
     case 'backgroundPosition':