diff --git a/src/wp-includes/class-wp-editor.php b/src/wp-includes/class-wp-editor.php
index cd102b0b37..acb20df264 100644
--- a/src/wp-includes/class-wp-editor.php
+++ b/src/wp-includes/class-wp-editor.php
@@ -962,7 +962,7 @@ final class _WP_Editors {
 			'Format' => _x( 'Format', 'TinyMCE menu' ),
 
 			// WordPress strings
-			'Help' => __( 'Help' ),
+			'Editor Help' => __( 'Editor Help' ),
 			'Toolbar Toggle' => __( 'Toolbar Toggle' ),
 			'Insert Read More tag' => __( 'Insert Read More tag' ),
 			'Distraction Free Writing' => __( 'Distraction Free Writing' ),
diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
index 234e2d0f98..946f7a7ab3 100644
--- a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
+++ b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -181,6 +181,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 	editor.addCommand( 'WP_Help', function() {
 		editor.windowManager.open({
 			url: tinymce.baseURL + '/wp-mce-help.php',
+			title: 'Editor Help',
 			width: 450,
 			height: 420,
 			inline: 1,
@@ -210,7 +211,7 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
 	});
 
 	editor.addButton( 'wp_help', {
-		tooltip: 'Help',
+		tooltip: 'Editor Help',
 		cmd: 'WP_Help'
 	});
 
diff --git a/src/wp-includes/js/tinymce/wp-mce-help.php b/src/wp-includes/js/tinymce/wp-mce-help.php
index 943586f09a..d449008998 100644
--- a/src/wp-includes/js/tinymce/wp-mce-help.php
+++ b/src/wp-includes/js/tinymce/wp-mce-help.php
@@ -13,8 +13,8 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
 <html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
 <head>
 <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
-<title><?php _e('Rich Editor Help'); ?></title>
-<script type="text/javascript" src="tiny_mce_popup.js?ver=358-20121205"></script>
+<title><?php _e('Editor Help'); ?></title>
+
 <?php wp_admin_css( 'wp-admin', true ); ?>
 <style type="text/css">
 
@@ -131,8 +131,11 @@ header('Content-Type: text/html; charset=' . get_bloginfo('charset'));
 </head>
 <body class="windows wp-core-ui">
 <script type="text/javascript">
-if ( tinymce.isMac )
+var win = window.dialogArguments || opener || parent || top;
+
+if ( win && win.tinymce && win.tinymce.isMac ) {
 	document.body.className = document.body.className.replace(/windows/, 'macos');
+}
 </script>
 
 <div id="tabs">
@@ -147,7 +150,7 @@ if ( tinymce.isMac )
 <div id="content1">
 	<h2><?php _e('Rich Editing Basics'); ?></h2>
 	<p><?php _e('<em>Rich editing</em>, also called WYSIWYG for What You See Is What You Get, means your text is formatted as you type. The rich editor creates HTML code behind the scenes while you concentrate on writing. Font styles, links and images all appear approximately as they will on the internet.'); ?></p>
-	<p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid XHTML 1.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.'); ?></p>
+	<p><?php _e('WordPress includes a rich HTML editor that works well in all major web browsers used today. However editing HTML is not the same as typing text. Each web page has two major components: the structure, which is the actual HTML code and is produced by the editor as you type, and the display, that is applied to it by the currently selected WordPress theme and is defined in style.css. WordPress is producing valid HTML 5.0 which means that inserting multiple line breaks (BR tags) after a paragraph would not produce white space on the web page. The BR tags will be removed as invalid by the internal HTML correcting functions.'); ?></p>
 	<p><?php _e('While using the editor, most basic keyboard shortcuts work like in any other text editor. For example: Shift+Enter inserts line break, Ctrl+C = copy, Ctrl+X = cut, Ctrl+Z = undo, Ctrl+Y = redo, Ctrl+A = select all, etc. (on Mac use the Command key instead of Ctrl). See the Hotkeys tab for all available keyboard shortcuts.'); ?></p>
 	<p><?php _e('If you do not like the way the rich editor works, you may turn it off from Your Profile submenu, under Users in the admin menu.'); ?></p>
 </div>
@@ -155,10 +158,10 @@ if ( tinymce.isMac )
 <div id="content2" class="hidden">
 	<h2><?php _e('Advanced Rich Editing'); ?></h2>
 	<h3><?php _e('Images and Attachments'); ?></h3>
-	<p><?php _e('There is a button in the editor toolbar for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button and enter the URL in the box which appears.'); ?></p>
-	<p><?php _e('If you need to upload an image or another media file from your computer, you can use the Media Library button above the editor. The media library will attempt to create a thumbnail-sized copy from each uploaded image. To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.'); ?></p>
+	<p><?php _e('The Add Media button above the editor toolbar can be used for inserting images that are already hosted somewhere on the internet. If you have a URL for an image, click this button, select Insert from URL, and enter the URL in the box which appears.'); ?></p>
+	<p><?php _e('If you need to upload an image or another media file from your computer, you can use the same Add Media button and select Insert Media: Upload Files or drag the files you wish to upload from the desktop and drop them into the browser window. The media library will attempt to create a thumbnail-sized copy from each uploaded image. To insert your image into the post, first click on the thumbnail to reveal a menu of options. When you have selected the options you like, click "Insert into Post" and your image or file will appear in the post you are editing.'); ?></p>
 	<h3><?php _e('HTML in the Rich Editor'); ?></h3>
-	<p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML elements that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;code&gt;. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.'); ?></p>
+	<p><?php _e('Any HTML entered directly into the rich editor will show up as text when the post is viewed. What you see is what you get. When you want to include HTML code that cannot be generated with the toolbar buttons, you must enter it by hand in the Text editor. Examples are tables and &lt;div&gt;. To do this, click the Text tab and edit the code, then switch back to Visual mode. If the code is valid and understood by the editor, you should see it rendered immediately.'); ?></p>
 	<h3><?php _e('Pasting in the Rich Editor'); ?></h3>
 	<p><?php _e('When pasting content from another web page the results can be inconsistent and depend on your browser and on the web page you are pasting from. The editor tries to correct any invalid HTML code that was pasted, but for best results try using the Text tab or the "Paste as text" button on the second row. Alternatively try pasting paragraph by paragraph. In most browsers to select one paragraph at a time, triple-click on it.'); ?></p>
 	<p><?php _e('Pasting content from another application, like Word or Excel, is automatically handled. If you want it to appear as plain text instead, you can use "Paste as text" button on the second row, or paste directly in Text mode.'); ?></p>
@@ -173,12 +176,12 @@ if ( tinymce.isMac )
 		<tr><th>c</th><td><?php _e('Copy'); ?></td><th>v</th><td><?php _e('Paste'); ?></td></tr>
 		<tr><th>a</th><td><?php _e('Select all'); ?></td><th>x</th><td><?php _e('Cut'); ?></td></tr>
 		<tr><th>z</th><td><?php _e('Undo'); ?></td><th>y</th><td><?php _e('Redo'); ?></td></tr>
-
 		<tr><th>b</th><td><?php _e('Bold'); ?></td><th>i</th><td><?php _e('Italic'); ?></td></tr>
 		<tr><th>u</th><td><?php _e('Underline'); ?></td><th>1</th><td><?php _e('Heading 1'); ?></td></tr>
 		<tr><th>2</th><td><?php _e('Heading 2'); ?></td><th>3</th><td><?php _e('Heading 3'); ?></td></tr>
 		<tr><th>4</th><td><?php _e('Heading 4'); ?></td><th>5</th><td><?php _e('Heading 5'); ?></td></tr>
 		<tr><th>6</th><td><?php _e('Heading 6'); ?></td><th>9</th><td><?php _e('Address'); ?></td></tr>
+		<tr><th>k</th><td><?php _e('Insert/edit link'); ?></td><th> </th><td>&nbsp;</td></tr>
 	</table>
 
 	<p><?php _e('The following shortcuts use different access keys: Alt + Shift + letter.'); ?></p>
@@ -192,6 +195,7 @@ if ( tinymce.isMac )
 		<tr><th>q</th><td><?php _e('Quote'); ?></td><th>m</th><td><?php _e('Insert Image'); ?></td></tr>
 		<tr><th>w</th><td><?php _e('Distraction Free Writing mode'); ?></td><th>t</th><td><?php _e('Insert More Tag'); ?></td></tr>
 		<tr><th>p</th><td><?php _e('Insert Page Break tag'); ?></td><th>h</th><td><?php _e('Help'); ?></td></tr>
+		<tr><th>x</th><td><?php _e('Add/remove code tag'); ?></td><th> </th><td>&nbsp;</td></tr>
 	</table>
 
 	<p style="padding: 15px 10px 10px;"><?php _e('Editor width in Distraction Free Writing mode:'); ?></p>
@@ -213,7 +217,9 @@ if ( tinymce.isMac )
 
 </div>
 <script type="text/javascript">
-	function d(id) { return document.getElementById(id); }
+	function d(id) {
+		return document.getElementById(id);
+	}
 
 	function flipTab(n) {
 		var i, c, t;
@@ -231,18 +237,10 @@ if ( tinymce.isMac )
 		}
 	}
 
-	tinyMCEPopup.onInit.add(function() {
-		var win = tinyMCEPopup.getWin();
-
-		d('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;
-		d('date').innerHTML = tinymce.releaseDate;
-
-		if ( win.fullscreen && win.fullscreen.settings.visible ) {
-			d('content1').className = 'hidden';
-			d('tabs').className = 'hidden';
-			d('content3').className = 'dfw';
-		}
-	});
+	if ( win && win.tinymce ) {
+		d('version').innerHTML = win.tinymce.majorVersion + "." + win.tinymce.minorVersion;
+		d('date').innerHTML = win.tinymce.releaseDate;
+	}
 </script>
 </body>
 </html>
