diff --git a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings-mac.xml b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings-mac.xml
new file mode 100644
--- /dev/null
+++ b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings-mac.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+
+Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
+
+
+The contents of this file are subject to the terms of either the GNU
+General Public License Version 2 only ("GPL") or the Common
+Development and Distribution License("CDDL") (collectively, the
+"License"). You may not use this file except in compliance with the
+License. You can obtain a copy of the License at
+http://www.netbeans.org/cddl-gplv2.html
+or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
+specific language governing permissions and limitations under the
+License.  When distributing the software, include this License Header
+Notice in each file and include the License file at
+nbbuild/licenses/CDDL-GPL-2-CP.  Sun designates this
+particular file as subject to the "Classpath" exception as provided
+by Sun in the GPL Version 2 section of the License file that
+accompanied this code. If applicable, add the following below the
+License Header, with the fields enclosed by brackets [] replaced by
+your own identifying information:
+"Portions Copyrighted [year] [name of copyright owner]"
+
+Contributor(s):
+
+The Original Software is NetBeans. The Initial Developer of the Original
+Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
+Microsystems, Inc. All Rights Reserved.
+
+If you wish your version of this file to be governed by only the CDDL
+or only the GPL Version 2, indicate your decision by adding
+"[Contributor] elects to include this software in this distribution
+under the [CDDL or GPL Version 2] license." If you do not indicate a
+single choice of license, a recipient has the option to distribute
+your version of this file under either the CDDL, the GPL Version 2 or
+to extend the choice of license to its licensees as provided above.
+However, if you add GPL Version 2 code and therefore, elected the GPL
+Version 2 license, then the option applies only if the new code is
+made subject to such option by the copyright holder.
+-->
+<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
+<!--
+    IMPORTANT:  This file modifies keybindings from NetBeans-keybindings.xml to make them work on Mac OS.
+-->
+
+<bindings>
+    <!-- Things we add that replace standard keybindings -->
+
+    <!-- Things we add only on the mac -->
+
+    <bind actionName="in-place-refactoring" key="DA-R"/>
+</bindings>
diff --git a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
--- a/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
+++ b/defaults/src/org/netbeans/modules/defaults/Eclipse-keybindings.xml
@@ -159,4 +159,7 @@
     <bind actionName="undo" key="D-Z"/>
     <bind actionName="undo" key="UNDO"/>
     <bind actionName="word-match-next" key="O-SLASH"/>
+
+    <bind key="OS-R" remove="true" />
+    <bind actionName="in-place-refactoring" key="OS-R"/>
 </bindings>
diff --git a/defaults/src/org/netbeans/modules/defaults/mf-layer.xml b/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
--- a/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
+++ b/defaults/src/org/netbeans/modules/defaults/mf-layer.xml
@@ -1358,6 +1358,9 @@
                 <folder name="Eclipse">
                     <folder name="Defaults">
                         <file name="org-netbeans-modules-defaults-keybindings.xml" url="Eclipse-keybindings.xml"/>
+                        <file name="org-netbeans-modules-editor-keybindings-mac.xml" url="Eclipse-keybindings-mac.xml">
+                            <attr name="nbeditor-settings-targetOS" stringvalue="OS_MAC"/>
+                        </file>
                     </folder>
                 </folder>
                 <folder name="Emacs">