diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt
index 1b4ae209d..4741ba5dd 100644
--- a/apps/openmw/CMakeLists.txt
+++ b/apps/openmw/CMakeLists.txt
@@ -114,7 +114,9 @@ endif()
 
 if(APPLE)
     find_library(CARBON_FRAMEWORK Carbon)
-    target_link_libraries(openmw ${CARBON_FRAMEWORK})
+    find_library(COCOA_FRAMEWORK Cocoa)
+    find_library(IOKIT_FRAMEWORK IOKit)
+    target_link_libraries(openmw ${CARBON_FRAMEWORK} ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
 endif(APPLE)
 
 if(DPKG_PROGRAM)
diff --git a/apps/openmw/mwinput/inputmanagerimp.cpp b/apps/openmw/mwinput/inputmanagerimp.cpp
index a7cce25c0..1aa4ceeff 100644
--- a/apps/openmw/mwinput/inputmanagerimp.cpp
+++ b/apps/openmw/mwinput/inputmanagerimp.cpp
@@ -387,9 +387,18 @@ namespace MWInput
 
     bool InputManager::keyPressed( const OIS::KeyEvent &arg )
     {
+        std::cout << "text received: " << arg.text << std::endl;
+
         mInputCtrl->keyPressed (arg);
+        unsigned int text = arg.text;
+        #ifdef __APPLE__ // filter \016 symbol for F-keys on OS X
+        if ((arg.key >= OIS::KC_F1 && arg.key <= OIS::KC_F10) ||
+            (arg.key >= OIS::KC_F11 && arg.key <= OIS::KC_F15)) {
+            text = 0;
+        }
+        #endif
 
-        MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(arg.key), arg.text);
+        MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(arg.key), text);
 
         return true;
     }