diff --git a/.gitignore b/.gitignore
index 4573214e..dccb80d9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ src/gui/gui.pro.user*
 src/gui/.qmake.stash
 src/gui/.rnd
 src/setup/win32/synergy.suo
+*.smbdelete*
diff --git a/src/lib/platform/OSXKeyState.cpp b/src/lib/platform/OSXKeyState.cpp
index a40ad16c..8317a8d7 100644
--- a/src/lib/platform/OSXKeyState.cpp
+++ b/src/lib/platform/OSXKeyState.cpp
@@ -390,6 +390,34 @@ OSXKeyState::fakeCtrlAltDel()
 	return false;
 }
 
+CGEventFlags
+OSXKeyState::getModifierStateAsOSXFlags()
+{
+    CGEventFlags modifiers = 0;
+    
+    if (m_shiftPressed) {
+        modifiers |= kCGEventFlagMaskShift;
+    }
+    
+    if (m_controlPressed) {
+        modifiers |= kCGEventFlagMaskControl;
+    }
+    
+    if (m_altPressed) {
+        modifiers |= kCGEventFlagMaskAlternate;
+    }
+    
+    if (m_superPressed) {
+        modifiers |= kCGEventFlagMaskCommand;
+    }
+    
+    if (m_capsPressed) {
+        modifiers |= kCGEventFlagMaskAlphaShift;
+    }
+    
+    return modifiers;
+}
+
 KeyModifierMask
 OSXKeyState::pollActiveModifiers() const
 {
diff --git a/src/lib/platform/OSXKeyState.h b/src/lib/platform/OSXKeyState.h
index fd481080..207d0738 100644
--- a/src/lib/platform/OSXKeyState.h
+++ b/src/lib/platform/OSXKeyState.h
@@ -100,6 +100,7 @@ public:
 	virtual SInt32		pollActiveGroup() const;
 	virtual void		pollPressedKeys(KeyButtonSet& pressedKeys) const;
 
+    CGEventFlags getModifierStateAsOSXFlags();
 protected:
 	// KeyState overrides
 	virtual void		getKeyMap(synergy::KeyMap& keyMap);
diff --git a/src/lib/platform/OSXScreen.cpp b/src/lib/platform/OSXScreen.cpp
index 3869d24f..bf536f70 100644
--- a/src/lib/platform/OSXScreen.cpp
+++ b/src/lib/platform/OSXScreen.cpp
@@ -528,6 +528,10 @@ OSXScreen::postMouseEvent(CGPoint& pos) const
     // Dragging events also need the click state
     CGEventSetIntegerValueField(event, kCGMouseEventClickState, m_clickState);
     
+    // Fix for sticky keys
+    CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags();
+    CGEventSetFlags(event, modifiers);
+    
 	CGEventPost(kCGHIDEventTap, event);
 	
 	CFRelease(event);
@@ -595,6 +599,10 @@ OSXScreen::fakeMouseButton(ButtonID id, bool press)
     
     CGEventSetIntegerValueField(event, kCGMouseEventClickState, m_clickState);
     
+    // Fix for sticky keys
+    CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags();
+    CGEventSetFlags(event, modifiers);
+    
     m_buttonState.set(index, state);
     CGEventPost(kCGHIDEventTap, event);
     
@@ -705,6 +713,10 @@ OSXScreen::fakeMouseWheel(SInt32 xDelta, SInt32 yDelta) const
 			mapScrollWheelFromSynergy(yDelta),
 			-mapScrollWheelFromSynergy(xDelta));
 		
+        // Fix for sticky keys
+        CGEventFlags modifiers = m_keyState->getModifierStateAsOSXFlags();
+        CGEventSetFlags(scrollEvent, modifiers);
+        
 		CGEventPost(kCGHIDEventTap, scrollEvent);
 		CFRelease(scrollEvent);
 #else