diff --git a/widget/src/cocoa/Makefile.in b/widget/src/cocoa/Makefile.in
index 87e28eea0810..ed7c56f5cca6 100644
--- a/widget/src/cocoa/Makefile.in
+++ b/widget/src/cocoa/Makefile.in
@@ -91,7 +91,6 @@ EXPORTS = \
 		$(NULL)
 
 MAC_LCPPSRCS = \
-		nsBidiKeyboard.cpp \
 		nsLookAndFeel.cpp \
 		nsToolkitBase.cpp \
 		nsDeviceContextSpecFactoryM.cpp \
@@ -116,6 +115,7 @@ CPPSRCS += nsNativeThemeCocoa.cpp
 endif
 
 CMMSRCS = \
+		nsBidiKeyboard.mm \
 		nsClipboard.mm \
 		nsMenuX.mm \
 		nsMenuBarX.mm \
diff --git a/widget/src/cocoa/nsBidiKeyboard.h b/widget/src/cocoa/nsBidiKeyboard.h
new file mode 100644
index 000000000000..2385672d05b6
--- /dev/null
+++ b/widget/src/cocoa/nsBidiKeyboard.h
@@ -0,0 +1,56 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is IBM code.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Simon Montagu
+ *   Asaf Romano <mozilla.mano@sent.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef __nsBidiKeyboard
+#define __nsBidiKeyboard
+#include "nsIBidiKeyboard.h"
+
+class nsBidiKeyboard : public nsIBidiKeyboard
+{
+public:
+  NS_DECL_ISUPPORTS
+  NS_DECL_NSIBIDIKEYBOARD
+
+  nsBidiKeyboard();
+  virtual ~nsBidiKeyboard();
+};
+
+
+#endif // __nsBidiKeyboard
diff --git a/widget/src/cocoa/nsBidiKeyboard.mm b/widget/src/cocoa/nsBidiKeyboard.mm
new file mode 100644
index 000000000000..0e3480141577
--- /dev/null
+++ b/widget/src/cocoa/nsBidiKeyboard.mm
@@ -0,0 +1,85 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is IBM code.
+ *
+ * The Initial Developer of the Original Code is
+ * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved.
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Simon Montagu
+ *   Asaf Romano <mozilla.mano@sent.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsBidiKeyboard.h"
+#include <Carbon/Carbon.h>
+
+NS_IMPL_ISUPPORTS1(nsBidiKeyboard, nsIBidiKeyboard)
+
+nsBidiKeyboard::nsBidiKeyboard() : nsIBidiKeyboard()
+{
+}
+
+nsBidiKeyboard::~nsBidiKeyboard()
+{
+}
+
+NS_IMETHODIMP nsBidiKeyboard::IsLangRTL(PRBool *aIsRTL)
+{
+  *aIsRTL = PR_FALSE;
+  nsresult rv = NS_ERROR_FAILURE;
+
+  OSStatus err;
+  KeyboardLayoutRef currentKeyboard;
+
+  err = ::KLGetCurrentKeyboardLayout(&currentKeyboard);
+  if (err == noErr) {
+    const void* currentKeyboardResID;
+    err = ::KLGetKeyboardLayoutProperty(currentKeyboard, kKLIdentifier,
+                                        &currentKeyboardResID);
+    if (err == noErr) {
+      // Check if the resource id is BiDi associated (Arabic, Persian, Hebrew)
+      // (Persian is included in the Arabic range)
+      // http://developer.apple.com/documentation/mac/Text/Text-534.html#HEADING534-0
+      // Note: these ^^ values are negative on Mac OS X
+      *aIsRTL = ((SInt32)currentKeyboardResID >= -18943 &&
+                 (SInt32)currentKeyboardResID <= -17920);
+      rv = NS_OK;
+    }
+  }
+
+  return rv;
+}
+
+NS_IMETHODIMP nsBidiKeyboard::SetLangFromBidiLevel(PRUint8 aLevel)
+{
+  // XXX Insert platform specific code to set keyboard language
+  return NS_OK;
+}