diff --git a/dlls/winemac.drv/cocoa_window.m b/dlls/winemac.drv/cocoa_window.m
index 7371cbc9f2f..2bb9aef37f1 100644
--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -117,6 +117,24 @@ static inline void fix_generic_modifiers_by_device(NSUInteger* modifiers)
         *modifiers &= ~NX_ALTERNATEMASK;
 }
 
+static inline NSUInteger adjusted_modifiers_for_option_behavior(NSUInteger modifiers)
+{
+    fix_device_modifiers_by_generic(&modifiers);
+    if (left_option_is_alt && (modifiers & NX_DEVICELALTKEYMASK))
+    {
+        modifiers |= NX_DEVICELCMDKEYMASK;
+        modifiers &= ~NX_DEVICELALTKEYMASK;
+    }
+    if (right_option_is_alt && (modifiers & NX_DEVICERALTKEYMASK))
+    {
+        modifiers |= NX_DEVICERCMDKEYMASK;
+        modifiers &= ~NX_DEVICERALTKEYMASK;
+    }
+    fix_generic_modifiers_by_device(&modifiers);
+
+    return modifiers;
+}
+
 
 @interface WineContentView : NSView <NSTextInputClient>
 {
@@ -1253,7 +1271,7 @@ - (void) postKeyEvent:(NSEvent *)theEvent
         [self flagsChanged:theEvent];
         [self postKey:[theEvent keyCode]
               pressed:[theEvent type] == NSKeyDown
-            modifiers:[theEvent modifierFlags]
+            modifiers:adjusted_modifiers_for_option_behavior([theEvent modifierFlags])
                 event:theEvent];
     }
 
@@ -1416,7 +1434,7 @@ - (void) flagsChanged:(NSEvent *)theEvent
             { NX_DEVICERCMDKEYMASK,     kVK_RightCommand },
         };
 
-        NSUInteger modifierFlags = [theEvent modifierFlags];
+        NSUInteger modifierFlags = adjusted_modifiers_for_option_behavior([theEvent modifierFlags]);
         NSUInteger changed;
         int i, last_changed;
 
diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
index 1a38b565f13..1c2d140feac 100644
--- a/dlls/winemac.drv/macdrv_cocoa.h
+++ b/dlls/winemac.drv/macdrv_cocoa.h
@@ -143,6 +143,8 @@
 extern int macdrv_err_on;
 extern int topmost_float_inactive DECLSPEC_HIDDEN;
 extern int capture_displays_for_fullscreen DECLSPEC_HIDDEN;
+extern int left_option_is_alt DECLSPEC_HIDDEN;
+extern int right_option_is_alt DECLSPEC_HIDDEN;
 
 extern int macdrv_start_cocoa_app(unsigned long long tickcount) DECLSPEC_HIDDEN;
 extern void macdrv_window_rejected_focus(const struct macdrv_event *event) DECLSPEC_HIDDEN;
diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c
index dd032f3dfb0..d27ce94ca47 100644
--- a/dlls/winemac.drv/macdrv_main.c
+++ b/dlls/winemac.drv/macdrv_main.c
@@ -50,6 +50,8 @@ int capture_displays_for_fullscreen = 0;
 BOOL skip_single_buffer_flushes = FALSE;
 BOOL allow_vsync = TRUE;
 BOOL allow_set_gamma = TRUE;
+int left_option_is_alt = 0;
+int right_option_is_alt = 0;
 
 
 /**************************************************************************
@@ -168,6 +170,11 @@ static void setup_options(void)
     if (!get_config_key(hkey, appkey, "AllowSetGamma", buffer, sizeof(buffer)))
         allow_set_gamma = IS_OPTION_TRUE(buffer[0]);
 
+    if (!get_config_key(hkey, appkey, "LeftOptionIsAlt", buffer, sizeof(buffer)))
+        left_option_is_alt = IS_OPTION_TRUE(buffer[0]);
+    if (!get_config_key(hkey, appkey, "RightOptionIsAlt", buffer, sizeof(buffer)))
+        right_option_is_alt = IS_OPTION_TRUE(buffer[0]);
+
     if (appkey) RegCloseKey(appkey);
     if (hkey) RegCloseKey(hkey);
 }