diff --git a/Makefile.am b/Makefile.am
index b66c21b674..3c7831a388 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,6 +145,7 @@ EXTRA_DIST += \
 	extras/package/macosx/Resources/English.lproj/ErrorPanel.xib \
 	extras/package/macosx/Resources/English.lproj/FSPanel.xib \
 	extras/package/macosx/Resources/English.lproj/InfoPlist.strings.in \
+	extras/package/macosx/Resources/English.lproj/Help.xib \
 	extras/package/macosx/Resources/English.lproj/MainMenu.xib \
 	extras/package/macosx/Resources/English.lproj/MainWindow.xib \
 	extras/package/macosx/Resources/English.lproj/MediaInfo.xib \
diff --git a/extras/package/macosx/Resources/English.lproj/About.xib b/extras/package/macosx/Resources/English.lproj/About.xib
index 22d02ddf6f..f9000ec436 100644
--- a/extras/package/macosx/Resources/English.lproj/About.xib
+++ b/extras/package/macosx/Resources/English.lproj/About.xib
@@ -2,14 +2,14 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">14B25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">6254</string>
-		<string key="IBDocument.AppKitVersion">1343.16</string>
-		<string key="IBDocument.HIToolboxVersion">755.00</string>
-		<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="com.apple.InterfaceBuilder.CocoaPlugin">6254</string>
-			<string key="com.apple.WebKitIBPlugin">6254</string>
-		</dictionary>
+		<string key="IBDocument.SystemVersion">14D136</string>
+		<string key="IBDocument.InterfaceBuilderVersion">7702</string>
+		<string key="IBDocument.AppKitVersion">1347.57</string>
+		<string key="IBDocument.HIToolboxVersion">758.70</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">7702</string>
+		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSBox</string>
 			<string>NSButton</string>
@@ -24,11 +24,9 @@
 			<string>NSTextView</string>
 			<string>NSView</string>
 			<string>NSWindowTemplate</string>
-			<string>WebView</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string>com.apple.WebKitIBPlugin</string>
 		</array>
 		<object class="NSMutableDictionary" key="IBDocument.Metadata">
 			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -36,7 +34,7 @@
 		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1043535821">
 			<object class="NSCustomObject" id="334305778">
-				<string key="NSClassName">VLCApplication</string>
+				<string key="NSClassName">AboutWindowController</string>
 			</object>
 			<object class="NSCustomObject" id="992412428">
 				<string key="NSClassName">FirstResponder</string>
@@ -87,6 +85,7 @@
 											<string key="NSFrameSize">{415, 204}</string>
 											<reference key="NSSuperview" ref="877730250"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="1033446111"/>
 											<object class="NSTextContainer" key="NSTextContainer" id="551886569">
 												<object class="NSLayoutManager" key="NSLayoutManager">
 													<object class="NSTextStorage" key="NSTextStorage">
@@ -154,7 +153,7 @@
 												<nil key="NSTextFinder"/>
 												<int key="NSPreferredTextFinderStyle">0</int>
 											</object>
-											<int key="NSTVFlags">6</int>
+											<int key="NSTVFlags">70</int>
 											<string key="NSMaxSize">{564, 10000000}</string>
 											<string key="NSMinize">{430, 204}</string>
 											<nil key="NSDelegate"/>
@@ -179,6 +178,7 @@
 									<string key="NSFrame">{{-100, -100}, {15, 99}}</string>
 									<reference key="NSSuperview" ref="943165371"/>
 									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="347136691"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<string key="NSControlAction">_doScroller:</string>
 									<reference key="NSControlTarget" ref="943165371"/>
@@ -192,6 +192,7 @@
 									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
 									<reference key="NSSuperview" ref="943165371"/>
 									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="877730250"/>
 									<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
 									<string key="NSControlAction">_doScroller:</string>
 									<reference key="NSControlTarget" ref="943165371"/>
@@ -228,6 +229,7 @@
 							<string key="NSFrame">{{20, 93}, {240, 240}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="1048236564"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSImageCell" key="NSCell" id="548775455">
 								<int key="NSCellFlags">134217728</int>
@@ -250,6 +252,7 @@
 							<string key="NSFrame">{{271, 274}, {430, 18}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="133543770"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="367117063">
 								<int key="NSCellFlags">-2077228991</int>
@@ -284,6 +287,7 @@
 							<string key="NSFrame">{{271, 255}, {430, 16}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="164401777"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="837500365">
 								<int key="NSCellFlags">-2077228991</int>
@@ -310,6 +314,7 @@
 							<string key="NSFrame">{{271, 241}, {430, 13}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="470682620"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="339855634">
 								<int key="NSCellFlags">-2078277631</int>
@@ -332,6 +337,7 @@
 							<string key="NSFrame">{{271, 304}, {479, 29}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="943165371"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="522802678">
 								<int key="NSCellFlags">69206017</int>
@@ -360,6 +366,7 @@
 							<string key="NSFrame">{{271, 88}, {430, 145}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="845122596"/>
 							<string key="NSReuseIdentifierKey">_NS:3939</string>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="273931819">
@@ -398,6 +405,7 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 											<string key="NSFrame">{{556, 49}, {106, 23}}</string>
 											<reference key="NSSuperview" ref="646071768"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="622282437"/>
 											<string key="NSReuseIdentifierKey">_NS:2498</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="229802879">
@@ -422,6 +430,7 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 											<string key="NSFrame">{{122, 49}, {106, 23}}</string>
 											<reference key="NSSuperview" ref="646071768"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="56148229"/>
 											<string key="NSReuseIdentifierKey">_NS:2498</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="559988317">
@@ -446,6 +455,7 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 											<string key="NSFrame">{{339, 49}, {106, 23}}</string>
 											<reference key="NSSuperview" ref="646071768"/>
 											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="635233983"/>
 											<string key="NSReuseIdentifierKey">_NS:2498</string>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="847201803">
@@ -498,12 +508,14 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 									<string key="NSFrame">{{1, 1}, {745, 88}}</string>
 									<reference key="NSSuperview" ref="845122596"/>
 									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="542792093"/>
 									<string key="NSReuseIdentifierKey">_NS:21</string>
 								</object>
 							</array>
 							<string key="NSFrame">{{-10, -9}, {747, 90}}</string>
 							<reference key="NSSuperview" ref="471759747"/>
 							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="646071768"/>
 							<string key="NSReuseIdentifierKey">_NS:18</string>
 							<string key="NSOffsets">{0, 0}</string>
 							<object class="NSTextFieldCell" key="NSTitleCell">
@@ -537,175 +549,12 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 					<string key="NSFrameSize">{721, 356}</string>
 					<reference key="NSSuperview"/>
 					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="684344310"/>
 				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
 				<string key="NSMinSize">{231.86799999999999, 129}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<string key="NSFrameAutosaveName">about</string>
-				<bool key="NSWindowIsRestorable">YES</bool>
-			</object>
-			<object class="NSCustomObject" id="338711652">
-				<string key="NSClassName">VLAboutBox</string>
-			</object>
-			<object class="NSWindowTemplate" id="877766192">
-				<int key="NSWindowStyleMask">15</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{336, 164}, {480, 400}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Help</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<nil key="NSUserInterfaceItemIdentifier"/>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="214470677">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<array class="NSMutableArray" key="NSSubviews">
-						<object class="WebView" id="313204393">
-							<reference key="NSNextResponder" ref="214470677"/>
-							<int key="NSvFlags">274</int>
-							<set class="NSMutableSet" key="NSDragTypes">
-								<string>Apple HTML pasteboard type</string>
-								<string>Apple PDF pasteboard type</string>
-								<string>Apple PICT pasteboard type</string>
-								<string>Apple URL pasteboard type</string>
-								<string>Apple Web Archive pasteboard type</string>
-								<string>NSColor pasteboard type</string>
-								<string>NSFilenamesPboardType</string>
-								<string>NSStringPboardType</string>
-								<string>NeXT RTFD pasteboard type</string>
-								<string>NeXT Rich Text Format v1.0 pasteboard type</string>
-								<string>NeXT TIFF v4.0 pasteboard type</string>
-								<string>WebURLsWithTitlesPboardType</string>
-								<string>public.png</string>
-								<string>public.url</string>
-								<string>public.url-name</string>
-							</set>
-							<string key="NSFrame">{{0, 40}, {480, 360}}</string>
-							<reference key="NSSuperview" ref="214470677"/>
-							<reference key="NSNextKeyView"/>
-							<string key="FrameName"/>
-							<string key="GroupName"/>
-							<object class="WebPreferences" key="Preferences">
-								<string key="Identifier"/>
-								<dictionary class="NSMutableDictionary" key="Values">
-									<boolean value="NO" key="WebKitAllowAnimatedImageLoopingPreferenceKey"/>
-									<boolean value="NO" key="WebKitAllowAnimatedImagesPreferenceKey"/>
-									<integer value="12" key="WebKitDefaultFixedFontSize"/>
-									<integer value="12" key="WebKitDefaultFontSize"/>
-									<boolean value="NO" key="WebKitDisplayImagesKey"/>
-									<boolean value="NO" key="WebKitJavaEnabled"/>
-									<boolean value="NO" key="WebKitJavaScriptCanOpenWindowsAutomatically"/>
-									<boolean value="NO" key="WebKitJavaScriptEnabled"/>
-									<integer value="1" key="WebKitMinimumFontSize"/>
-									<boolean value="NO" key="WebKitPluginsEnabled"/>
-									<string key="WebKitStandardFont">Hiragino Mincho Pro</string>
-								</dictionary>
-							</object>
-							<bool key="UseBackForwardList">YES</bool>
-							<bool key="AllowsUndo">YES</bool>
-						</object>
-						<object class="NSButton" id="864824002">
-							<reference key="NSNextResponder" ref="214470677"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{20, 8}, {39, 25}}</string>
-							<reference key="NSSuperview" ref="214470677"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="49708989">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">⌂</string>
-								<object class="NSFont" key="NSSupport">
-									<bool key="IBIsSystemFont">YES</bool>
-									<double key="NSSize">20</double>
-									<int key="NSfFlags">2072</int>
-								</object>
-								<reference key="NSControlView" ref="864824002"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">35</int>
-								<object class="NSFont" key="NSAlternateImage">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">20</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="155686615">
-							<reference key="NSNextResponder" ref="214470677"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{67, 8}, {39, 25}}</string>
-							<reference key="NSSuperview" ref="214470677"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="220711835">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">←</string>
-								<object class="NSFont" key="NSSupport">
-									<bool key="IBIsSystemFont">YES</bool>
-									<double key="NSSize">18</double>
-									<int key="NSfFlags">2072</int>
-								</object>
-								<reference key="NSControlView" ref="155686615"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">35</int>
-								<object class="NSFont" key="NSAlternateImage" id="771652980">
-									<string key="NSName">LucidaGrande</string>
-									<double key="NSSize">18</double>
-									<int key="NSfFlags">16</int>
-								</object>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-						<object class="NSButton" id="783595180">
-							<reference key="NSNextResponder" ref="214470677"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{114, 8}, {39, 25}}</string>
-							<reference key="NSSuperview" ref="214470677"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="171700169">
-								<int key="NSCellFlags">67108864</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">→</string>
-								<object class="NSFont" key="NSSupport">
-									<bool key="IBIsSystemFont">YES</bool>
-									<double key="NSSize">18</double>
-									<int key="NSfFlags">2072</int>
-								</object>
-								<reference key="NSControlView" ref="783595180"/>
-								<int key="NSButtonFlags">-2038284288</int>
-								<int key="NSButtonFlags2">35</int>
-								<reference key="NSAlternateImage" ref="771652980"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
-						</object>
-					</array>
-					<string key="NSFrameSize">{480, 400}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
-				<string key="NSFrameAutosaveName">help</string>
+				<string key="NSFrameAutosaveName"/>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 		</array>
@@ -713,211 +562,139 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 			<array key="connectionRecords">
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="371989265"/>
-						<reference key="destination" ref="338711652"/>
-					</object>
-					<int key="connectionID">1357</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_credits_textview</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="139161632"/>
-					</object>
-					<int key="connectionID">1353</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_credits_scrollview</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="943165371"/>
+						<string key="label">window</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="371989265"/>
 					</object>
-					<int key="connectionID">1355</int>
+					<int key="connectionID">2317</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_about_window</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="371989265"/>
+						<string key="label">o_name_field</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="1048236564"/>
 					</object>
-					<int key="connectionID">1356</int>
+					<int key="connectionID">2318</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">o_name_version_field</string>
-						<reference key="source" ref="338711652"/>
+						<reference key="source" ref="334305778"/>
 						<reference key="destination" ref="479386874"/>
 					</object>
-					<int key="connectionID">2236</int>
+					<int key="connectionID">2319</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">o_copyright_field</string>
-						<reference key="source" ref="338711652"/>
+						<reference key="source" ref="334305778"/>
 						<reference key="destination" ref="133543770"/>
 					</object>
-					<int key="connectionID">2237</int>
+					<int key="connectionID">2320</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">o_revision_field</string>
-						<reference key="source" ref="338711652"/>
+						<reference key="source" ref="334305778"/>
 						<reference key="destination" ref="164401777"/>
 					</object>
-					<int key="connectionID">2238</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_help_window</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="877766192"/>
-					</object>
-					<int key="connectionID">2242</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_help_web_view</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="313204393"/>
-					</object>
-					<int key="connectionID">2243</int>
+					<int key="connectionID">2321</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_name_field</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="1048236564"/>
-					</object>
-					<int key="connectionID">2252</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_help_home_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="864824002"/>
+						<string key="label">o_joinus_txt</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="470682620"/>
 					</object>
-					<int key="connectionID">2259</int>
+					<int key="connectionID">2322</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_help_bwd_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="155686615"/>
+						<string key="label">o_authors_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="542792093"/>
 					</object>
-					<int key="connectionID">2260</int>
+					<int key="connectionID">2323</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_help_fwd_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="783595180"/>
-					</object>
-					<int key="connectionID">2261</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">helpGoHome:</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="864824002"/>
+						<string key="label">o_gpl_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="56148229"/>
 					</object>
-					<int key="connectionID">2262</int>
+					<int key="connectionID">2324</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_authors_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="542792093"/>
+						<string key="label">o_credits_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="635233983"/>
 					</object>
-					<int key="connectionID">2292</int>
+					<int key="connectionID">2325</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_gpl_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="56148229"/>
+						<string key="label">o_trademarks_txt</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="622282437"/>
 					</object>
-					<int key="connectionID">2293</int>
+					<int key="connectionID">2326</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_credits_btn</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="635233983"/>
+						<string key="label">o_icon_view</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="684344310"/>
 					</object>
-					<int key="connectionID">2294</int>
+					<int key="connectionID">2327</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">buttonAction:</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="635233983"/>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="542792093"/>
 					</object>
-					<int key="connectionID">2295</int>
+					<int key="connectionID">2328</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">buttonAction:</string>
-						<reference key="source" ref="338711652"/>
+						<reference key="source" ref="334305778"/>
 						<reference key="destination" ref="56148229"/>
 					</object>
-					<int key="connectionID">2296</int>
+					<int key="connectionID">2329</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">buttonAction:</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="542792093"/>
-					</object>
-					<int key="connectionID">2297</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_joinus_txt</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="470682620"/>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="635233983"/>
 					</object>
-					<int key="connectionID">2299</int>
+					<int key="connectionID">2330</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_icon_view</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="684344310"/>
+						<string key="label">o_credits_scrollview</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="943165371"/>
 					</object>
-					<int key="connectionID">2300</int>
+					<int key="connectionID">2333</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">o_trademarks_txt</string>
-						<reference key="source" ref="338711652"/>
-						<reference key="destination" ref="622282437"/>
+						<string key="label">o_credits_textview</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="139161632"/>
 					</object>
-					<int key="connectionID">2316</int>
+					<int key="connectionID">2334</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">frameLoadDelegate</string>
-						<reference key="source" ref="313204393"/>
-						<reference key="destination" ref="338711652"/>
-					</object>
-					<int key="connectionID">2265</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">goForward:</string>
-						<reference key="source" ref="313204393"/>
-						<reference key="destination" ref="783595180"/>
-					</object>
-					<int key="connectionID">2266</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">goBack:</string>
-						<reference key="source" ref="313204393"/>
-						<reference key="destination" ref="155686615"/>
+						<string key="label">delegate</string>
+						<reference key="source" ref="371989265"/>
+						<reference key="destination" ref="334305778"/>
 					</object>
-					<int key="connectionID">2267</int>
+					<int key="connectionID">2332</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -1011,61 +788,6 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 						</array>
 						<reference key="parent" ref="471759747"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1349</int>
-						<reference key="object" ref="338711652"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">VLAboutBox</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2239</int>
-						<reference key="object" ref="877766192"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="214470677"/>
-						</array>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Help</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2240</int>
-						<reference key="object" ref="214470677"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="313204393"/>
-							<reference ref="864824002"/>
-							<reference ref="155686615"/>
-							<reference ref="783595180"/>
-						</array>
-						<reference key="parent" ref="877766192"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2241</int>
-						<reference key="object" ref="313204393"/>
-						<reference key="parent" ref="214470677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2256</int>
-						<reference key="object" ref="864824002"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="49708989"/>
-						</array>
-						<reference key="parent" ref="214470677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2257</int>
-						<reference key="object" ref="155686615"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="220711835"/>
-						</array>
-						<reference key="parent" ref="214470677"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2258</int>
-						<reference key="object" ref="783595180"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="171700169"/>
-						</array>
-						<reference key="parent" ref="214470677"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2270</int>
 						<reference key="object" ref="367117063"/>
@@ -1086,21 +808,6 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 						<reference key="object" ref="522802678"/>
 						<reference key="parent" ref="1048236564"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2275</int>
-						<reference key="object" ref="49708989"/>
-						<reference key="parent" ref="864824002"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2276</int>
-						<reference key="object" ref="220711835"/>
-						<reference key="parent" ref="155686615"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">2277</int>
-						<reference key="object" ref="171700169"/>
-						<reference key="parent" ref="783595180"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">2278</int>
 						<reference key="object" ref="1033446111"/>
@@ -1217,27 +924,16 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 				<string key="1345.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="1345.IBWindowTemplateEditedContentRect">{{154, 399}, {721, 356}}</string>
 				<string key="1348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="1349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2231.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2232.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2233.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2234.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2235.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2239.IBWindowTemplateEditedContentRect">{{452, 244}, {480, 400}}</string>
-				<string key="2240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2241.IBPluginDependency">com.apple.WebKitIBPlugin</string>
-				<string key="2256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2269.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2270.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2271.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2273.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2275.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="2277.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2278.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<boolean value="YES" key="2278.IBShouldRemoveOnLegacySave"/>
 				<string key="2279.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1258,40 +954,31 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">2316</int>
+			<int key="maxID">2341</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">VLAboutBox</string>
-					<string key="superclassName">NSObject</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="buttonAction:">id</string>
-						<string key="helpGoHome:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="buttonAction:">
+					<string key="className">AboutWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">buttonAction:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">buttonAction:</string>
+						<object class="IBActionInfo" key="NS.object.0">
 							<string key="name">buttonAction:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="helpGoHome:">
-							<string key="name">helpGoHome:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
+					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="o_about_window">id</string>
 						<string key="o_authors_btn">id</string>
 						<string key="o_copyright_field">id</string>
 						<string key="o_credits_btn">id</string>
 						<string key="o_credits_scrollview">id</string>
 						<string key="o_credits_textview">id</string>
 						<string key="o_gpl_btn">id</string>
-						<string key="o_help_bwd_btn">id</string>
-						<string key="o_help_fwd_btn">id</string>
-						<string key="o_help_home_btn">id</string>
-						<string key="o_help_web_view">WebView</string>
-						<string key="o_help_window">id</string>
 						<string key="o_icon_view">id</string>
 						<string key="o_joinus_txt">id</string>
 						<string key="o_name_field">id</string>
@@ -1300,10 +987,6 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 						<string key="o_trademarks_txt">id</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="o_about_window">
-							<string key="name">o_about_window</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="o_authors_btn">
 							<string key="name">o_authors_btn</string>
 							<string key="candidateClassName">id</string>
@@ -1328,26 +1011,6 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 							<string key="name">o_gpl_btn</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="o_help_bwd_btn">
-							<string key="name">o_help_bwd_btn</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="o_help_fwd_btn">
-							<string key="name">o_help_fwd_btn</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="o_help_home_btn">
-							<string key="name">o_help_home_btn</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="o_help_web_view">
-							<string key="name">o_help_web_view</string>
-							<string key="candidateClassName">WebView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="o_help_window">
-							<string key="name">o_help_window</string>
-							<string key="candidateClassName">id</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="o_icon_view">
 							<string key="name">o_icon_view</string>
 							<string key="candidateClassName">id</string>
@@ -1379,32 +1042,21 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">VLAboutBox</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="buttonAction:">id</string>
-						<string key="helpGoHome:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="buttonAction:">
+					<string key="className">AboutWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">buttonAction:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">buttonAction:</string>
+						<object class="IBActionInfo" key="NS.object.0">
 							<string key="name">buttonAction:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-						<object class="IBActionInfo" key="helpGoHome:">
-							<string key="name">helpGoHome:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-					</dictionary>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../modules/gui/macosx/about.m</string>
 					</object>
-				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">VLCApplication</string>
-					<string key="superclassName">NSApplication</string>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">../../../../modules/gui/macosx/intf.h</string>
+						<string key="minorKey">../../../../modules/gui/macosx/about.m</string>
 					</object>
 				</object>
 			</array>
@@ -1570,70 +1222,22 @@ YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4</string>
 					</object>
 				</object>
 				<object class="IBPartialClassDescription">
-					<string key="className">WebView</string>
-					<string key="superclassName">NSView</string>
-					<dictionary class="NSMutableDictionary" key="actions">
-						<string key="goBack:">id</string>
-						<string key="goForward:">id</string>
-						<string key="makeTextLarger:">id</string>
-						<string key="makeTextSmaller:">id</string>
-						<string key="makeTextStandardSize:">id</string>
-						<string key="reload:">id</string>
-						<string key="reloadFromOrigin:">id</string>
-						<string key="stopLoading:">id</string>
-						<string key="takeStringURLFrom:">id</string>
-						<string key="toggleContinuousSpellChecking:">id</string>
-						<string key="toggleSmartInsertDelete:">id</string>
-					</dictionary>
-					<dictionary class="NSMutableDictionary" key="actionInfosByName">
-						<object class="IBActionInfo" key="goBack:">
-							<string key="name">goBack:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="goForward:">
-							<string key="name">goForward:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="makeTextLarger:">
-							<string key="name">makeTextLarger:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="makeTextSmaller:">
-							<string key="name">makeTextSmaller:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="makeTextStandardSize:">
-							<string key="name">makeTextStandardSize:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="reload:">
-							<string key="name">reload:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="reloadFromOrigin:">
-							<string key="name">reloadFromOrigin:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="stopLoading:">
-							<string key="name">stopLoading:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="takeStringURLFrom:">
-							<string key="name">takeStringURLFrom:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleContinuousSpellChecking:">
-							<string key="name">toggleContinuousSpellChecking:</string>
-							<string key="candidateClassName">id</string>
-						</object>
-						<object class="IBActionInfo" key="toggleSmartInsertDelete:">
-							<string key="name">toggleSmartInsertDelete:</string>
+					<string key="className">NSWindowController</string>
+					<string key="superclassName">NSResponder</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">showWindow:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">showWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">showWindow:</string>
 							<string key="candidateClassName">id</string>
 						</object>
-					</dictionary>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">WebKit.framework/Headers/WebView.h</string>
+						<string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
 					</object>
 				</object>
 			</array>
diff --git a/extras/package/macosx/Resources/English.lproj/Help.xib b/extras/package/macosx/Resources/English.lproj/Help.xib
new file mode 100644
index 0000000000..bf7fc3ed10
--- /dev/null
+++ b/extras/package/macosx/Resources/English.lproj/Help.xib
@@ -0,0 +1,408 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">14D136</string>
+		<string key="IBDocument.InterfaceBuilderVersion">7702</string>
+		<string key="IBDocument.AppKitVersion">1347.57</string>
+		<string key="IBDocument.HIToolboxVersion">758.70</string>
+		<dictionary class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="com.apple.InterfaceBuilder.CocoaPlugin">7702</string>
+			<string key="com.apple.WebKitIBPlugin">7702</string>
+		</dictionary>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSButton</string>
+			<string>NSButtonCell</string>
+			<string>NSCustomObject</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>WebView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string>com.apple.WebKitIBPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1043535821">
+			<object class="NSCustomObject" id="334305778">
+				<string key="NSClassName">HelpWindowController</string>
+			</object>
+			<object class="NSCustomObject" id="992412428">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="661246164">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="877766192">
+				<int key="NSWindowStyleMask">15</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{336, 164}, {480, 400}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">Help</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="214470677">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="WebView" id="313204393">
+							<reference key="NSNextResponder" ref="214470677"/>
+							<int key="NSvFlags">274</int>
+							<set class="NSMutableSet" key="NSDragTypes">
+								<string>Apple HTML pasteboard type</string>
+								<string>Apple PDF pasteboard type</string>
+								<string>Apple PICT pasteboard type</string>
+								<string>Apple URL pasteboard type</string>
+								<string>Apple Web Archive pasteboard type</string>
+								<string>NSColor pasteboard type</string>
+								<string>NSFilenamesPboardType</string>
+								<string>NSStringPboardType</string>
+								<string>NeXT RTFD pasteboard type</string>
+								<string>NeXT Rich Text Format v1.0 pasteboard type</string>
+								<string>NeXT TIFF v4.0 pasteboard type</string>
+								<string>WebURLsWithTitlesPboardType</string>
+								<string>public.png</string>
+								<string>public.url</string>
+								<string>public.url-name</string>
+							</set>
+							<string key="NSFrame">{{0, 40}, {480, 360}}</string>
+							<reference key="NSSuperview" ref="214470677"/>
+							<reference key="NSNextKeyView"/>
+							<string key="FrameName"/>
+							<string key="GroupName"/>
+							<object class="WebPreferences" key="Preferences">
+								<string key="Identifier"/>
+								<dictionary class="NSMutableDictionary" key="Values">
+									<boolean value="NO" key="WebKitAllowAnimatedImageLoopingPreferenceKey"/>
+									<boolean value="NO" key="WebKitAllowAnimatedImagesPreferenceKey"/>
+									<integer value="12" key="WebKitDefaultFixedFontSize"/>
+									<integer value="12" key="WebKitDefaultFontSize"/>
+									<boolean value="NO" key="WebKitDisplayImagesKey"/>
+									<boolean value="NO" key="WebKitJavaEnabled"/>
+									<boolean value="NO" key="WebKitJavaScriptCanOpenWindowsAutomatically"/>
+									<boolean value="NO" key="WebKitJavaScriptEnabled"/>
+									<integer value="1" key="WebKitMinimumFontSize"/>
+									<boolean value="NO" key="WebKitPluginsEnabled"/>
+									<string key="WebKitStandardFont">Hiragino Mincho Pro</string>
+								</dictionary>
+							</object>
+							<bool key="UseBackForwardList">YES</bool>
+							<bool key="AllowsUndo">YES</bool>
+						</object>
+						<object class="NSButton" id="864824002">
+							<reference key="NSNextResponder" ref="214470677"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{20, 8}, {39, 25}}</string>
+							<reference key="NSSuperview" ref="214470677"/>
+							<reference key="NSNextKeyView" ref="155686615"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="49708989">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">⌂</string>
+								<object class="NSFont" key="NSSupport">
+									<bool key="IBIsSystemFont">YES</bool>
+									<double key="NSSize">20</double>
+									<int key="NSfFlags">2072</int>
+								</object>
+								<reference key="NSControlView" ref="864824002"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">35</int>
+								<object class="NSFont" key="NSAlternateImage">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">20</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="155686615">
+							<reference key="NSNextResponder" ref="214470677"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{67, 8}, {39, 25}}</string>
+							<reference key="NSSuperview" ref="214470677"/>
+							<reference key="NSNextKeyView" ref="783595180"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="220711835">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">←</string>
+								<object class="NSFont" key="NSSupport">
+									<bool key="IBIsSystemFont">YES</bool>
+									<double key="NSSize">18</double>
+									<int key="NSfFlags">2072</int>
+								</object>
+								<reference key="NSControlView" ref="155686615"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">35</int>
+								<object class="NSFont" key="NSAlternateImage" id="771652980">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">18</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+						<object class="NSButton" id="783595180">
+							<reference key="NSNextResponder" ref="214470677"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{114, 8}, {39, 25}}</string>
+							<reference key="NSSuperview" ref="214470677"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="171700169">
+								<int key="NSCellFlags">67108864</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">→</string>
+								<object class="NSFont" key="NSSupport">
+									<bool key="IBIsSystemFont">YES</bool>
+									<double key="NSSize">18</double>
+									<int key="NSfFlags">2072</int>
+								</object>
+								<reference key="NSControlView" ref="783595180"/>
+								<int key="NSButtonFlags">-2038284288</int>
+								<int key="NSButtonFlags2">35</int>
+								<reference key="NSAlternateImage" ref="771652980"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+							<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{480, 400}</string>
+					<reference key="NSNextKeyView" ref="313204393"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1027}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<string key="NSFrameAutosaveName"/>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">o_help_fwd_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="783595180"/>
+					</object>
+					<int key="connectionID">2335</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">o_help_bwd_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="155686615"/>
+					</object>
+					<int key="connectionID">2336</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">o_help_home_btn</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="864824002"/>
+					</object>
+					<int key="connectionID">2337</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">helpGoHome:</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="864824002"/>
+					</object>
+					<int key="connectionID">2338</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">o_help_web_view</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="313204393"/>
+					</object>
+					<int key="connectionID">2341</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="334305778"/>
+						<reference key="destination" ref="877766192"/>
+					</object>
+					<int key="connectionID">2342</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">goForward:</string>
+						<reference key="source" ref="313204393"/>
+						<reference key="destination" ref="783595180"/>
+					</object>
+					<int key="connectionID">2266</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">goBack:</string>
+						<reference key="source" ref="313204393"/>
+						<reference key="destination" ref="155686615"/>
+					</object>
+					<int key="connectionID">2267</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">frameLoadDelegate</string>
+						<reference key="source" ref="313204393"/>
+						<reference key="destination" ref="334305778"/>
+					</object>
+					<int key="connectionID">2340</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1043535821"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="334305778"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="992412428"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2239</int>
+						<reference key="object" ref="877766192"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="214470677"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Help</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2240</int>
+						<reference key="object" ref="214470677"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="313204393"/>
+							<reference ref="864824002"/>
+							<reference ref="155686615"/>
+							<reference ref="783595180"/>
+						</array>
+						<reference key="parent" ref="877766192"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2241</int>
+						<reference key="object" ref="313204393"/>
+						<reference key="parent" ref="214470677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2256</int>
+						<reference key="object" ref="864824002"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="49708989"/>
+						</array>
+						<reference key="parent" ref="214470677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2257</int>
+						<reference key="object" ref="155686615"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="220711835"/>
+						</array>
+						<reference key="parent" ref="214470677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2258</int>
+						<reference key="object" ref="783595180"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="171700169"/>
+						</array>
+						<reference key="parent" ref="214470677"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2275</int>
+						<reference key="object" ref="49708989"/>
+						<reference key="parent" ref="864824002"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2276</int>
+						<reference key="object" ref="220711835"/>
+						<reference key="parent" ref="155686615"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2277</int>
+						<reference key="object" ref="171700169"/>
+						<reference key="parent" ref="783595180"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="661246164"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2239.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2239.IBWindowTemplateEditedContentRect">{{452, 244}, {480, 400}}</string>
+				<reference key="2240.IBNSViewMetadataGestureRecognizers" ref="0"/>
+				<string key="2240.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2241.IBPluginDependency">com.apple.WebKitIBPlugin</string>
+				<string key="2256.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2257.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2275.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2276.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2277.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">2342</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes"/>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<bool key="IBDocument.previouslyAttemptedUpgradeToXcode5">NO</bool>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<integer value="4600" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index c2c39a2c28..f169fd721e 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -342,6 +342,7 @@
 		1C88BCC119DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8B19DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png */; };
 		1C88BCC219DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8C19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png */; };
 		1C88BCC319DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1C88BC8D19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png */; };
+		1CBB2CC81B06A6DE00110ADA /* Help.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1CBB2CC61B06A6DE00110ADA /* Help.xib */; };
 		1CCB5F511A62A724004C3E90 /* about.h in Sources */ = {isa = PBXBuildFile; fileRef = 8EE1AF9F044465080059A3A7 /* about.h */; };
 		1CCB5F521A62A724004C3E90 /* about.m in Sources */ = {isa = PBXBuildFile; fileRef = 8EE1AFA0044465080059A3A7 /* about.m */; };
 		1CCB5F531A62A724004C3E90 /* AddonListDataSource.h in Sources */ = {isa = PBXBuildFile; fileRef = 7DF0435E1972E26A0022B534 /* AddonListDataSource.h */; };
@@ -1204,6 +1205,7 @@
 		1C88BC8B19DC7CB300645190 /* ys-fs_volume_slider_knob@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob@2x.png"; sourceTree = "<group>"; };
 		1C88BC8C19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob_highlight.png"; sourceTree = "<group>"; };
 		1C88BC8D19DC7CB300645190 /* ys-fs_volume_slider_knob_highlight@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ys-fs_volume_slider_knob_highlight@2x.png"; sourceTree = "<group>"; };
+		1CBB2CC71B06A6DE00110ADA /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = Resources/English.lproj/Help.xib; sourceTree = "<group>"; };
 		1CCB5F2F1A62A6A5004C3E90 /* pseudo-vlc.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "pseudo-vlc.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		1CE5ED1B19DD6AB700FCEFD3 /* lion-window-fullscreen-on.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lion-window-fullscreen-on.png"; sourceTree = "<group>"; };
 		1CE5ED1C19DD6AB700FCEFD3 /* lion-window-fullscreen-on@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "lion-window-fullscreen-on@2x.png"; sourceTree = "<group>"; };
@@ -2882,6 +2884,7 @@
 			children = (
 				E0FB95CC1615B6DF0005069A /* DetachedVideoWindow.xib */,
 				CCD83E2E13FEA143004F1652 /* About.xib */,
+				1CBB2CC61B06A6DE00110ADA /* Help.xib */,
 				CCD83E3013FEA143004F1652 /* AudioEffects.xib */,
 				CCD83E3213FEA143004F1652 /* Bookmarks.xib */,
 				CCD83E3413FEA143004F1652 /* CoreDialogs.xib */,
@@ -3691,6 +3694,7 @@
 				CC166FEC15F517660088201B /* backward-6btns@2x.png in Resources */,
 				CC166FF115F517720088201B /* forward-6btns-pressed.png in Resources */,
 				1C88BCB319DC7CB300645190 /* ys-fs_time_slider_knob@2x.png in Resources */,
+				1CBB2CC81B06A6DE00110ADA /* Help.xib in Resources */,
 				CC166FF215F517720088201B /* forward-6btns-pressed@2x.png in Resources */,
 				CC166FF315F517720088201B /* forward-6btns.png in Resources */,
 				CC166FF415F517720088201B /* forward-6btns@2x.png in Resources */,
@@ -3835,6 +3839,14 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXVariantGroup section */
+		1CBB2CC61B06A6DE00110ADA /* Help.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				1CBB2CC71B06A6DE00110ADA /* English */,
+			);
+			name = Help.xib;
+			sourceTree = "<group>";
+		};
 		7D3F6523188051F2005776C4 /* BWQuincyMain.xib */ = {
 			isa = PBXVariantGroup;
 			children = (
@@ -4267,6 +4279,7 @@
 				1CCB5F4C1A62A6A5004C3E90 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Default;
 		};
 		C2F2A6EA09588F1B00018C74 /* Build configuration list for PBXProject "vlc" */ = {
 			isa = XCConfigurationList;
diff --git a/modules/gui/macosx/MainMenu.h b/modules/gui/macosx/MainMenu.h
index 91c53708fa..482a433fd2 100644
--- a/modules/gui/macosx/MainMenu.h
+++ b/modules/gui/macosx/MainMenu.h
@@ -25,11 +25,13 @@
 #import <vlc_common.h>
 #import <vlc_interface.h>
 
+@class AboutWindowController;
+@class HelpWindowController;
+
 @interface VLCMainMenu : NSObject
 {
     intf_thread_t *p_intf;
     BOOL b_mainMenu_setup;
-    BOOL b_nib_about_loaded;
     BOOL b_nib_videoeffects_loaded;
     BOOL b_nib_audioeffects_loaded;
     BOOL b_nib_tracksynchro_loaded;
@@ -37,7 +39,8 @@
     BOOL b_nib_convertandsave_loaded;
     BOOL b_nib_addonmanager_loaded;
 
-    id o_about;                 /* VLAboutBox     */
+    AboutWindowController *o_about;
+    HelpWindowController  *o_helpWin;
     id o_videoeffects;          /* VLCVideoEffects */
     id o_audioeffects;          /* VLCAudioEffects */
     id o_trackSynchronization;  /* VLCTrackSynchronization */
@@ -346,4 +349,3 @@
 - (int)type;
 
 @end
-
diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m
index 9593ad756c..3f3fae10a9 100644
--- a/modules/gui/macosx/MainMenu.m
+++ b/modules/gui/macosx/MainMenu.m
@@ -94,8 +94,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];
 
-    if (b_nib_about_loaded)
-        [o_about release];
+    [o_about release];
+    [o_helpWin release];
 
     if (b_nib_videoeffects_loaded)
         [o_videoeffects release];
@@ -1200,11 +1200,8 @@ static VLCMainMenu *_o_sharedInstance = nil;
 
 - (void)initAbout
 {
-    if (! o_about)
-        o_about = [[VLAboutBox alloc] init];
-
-    if (!b_nib_about_loaded)
-        b_nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp];
+    if (!o_about)
+        o_about = [[AboutWindowController alloc] init];
 }
 
 - (IBAction)viewAbout:(id)sender
@@ -1221,8 +1218,10 @@ static VLCMainMenu *_o_sharedInstance = nil;
 
 - (IBAction)viewHelp:(id)sender
 {
-    [self initAbout];
-    [o_about showHelp];
+    if (!o_helpWin)
+        o_helpWin = [[HelpWindowController alloc] init];
+
+    [o_helpWin showHelp];
 }
 
 - (IBAction)openReadMe:(id)sender
diff --git a/modules/gui/macosx/about.h b/modules/gui/macosx/about.h
index 8bab02e484..a454dd5dcb 100644
--- a/modules/gui/macosx/about.h
+++ b/modules/gui/macosx/about.h
@@ -27,10 +27,9 @@
 /*****************************************************************************
  * VLAboutBox interface
  *****************************************************************************/
-@interface VLAboutBox : NSObject
+@interface AboutWindowController : NSWindowController<NSWindowDelegate>
 {
     /* main about panel and stuff related to its views */
-    IBOutlet id o_about_window;
     IBOutlet id o_name_version_field;
     IBOutlet id o_revision_field;
     IBOutlet id o_copyright_field;
@@ -49,23 +48,25 @@
     CGFloat f_end;
     NSTimeInterval i_start;
     BOOL b_restart;
-    BOOL b_isSetUp;
 
     NSString *o_authors;
+}
+
+- (void)showAbout;
+- (void)showGPL;
+- (IBAction)buttonAction:(id)sender;
+
+@end
 
-    /* generic help window */
-    IBOutlet id o_help_window;
+@interface HelpWindowController : NSWindowController
+{
     IBOutlet WebView *o_help_web_view; //we may _not_ use id here because of method name collisions
     IBOutlet id o_help_bwd_btn;
     IBOutlet id o_help_fwd_btn;
     IBOutlet id o_help_home_btn;
 }
 
-+ (VLAboutBox *)sharedInstance;
-- (void)showAbout;
-- (void)showHelp;
-- (void)showGPL;
-- (IBAction)buttonAction:(id)sender;
 - (IBAction)helpGoHome:(id)sender;
+- (void)showHelp;
 
 @end
diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index d0d644d84f..5fad724d92 100644
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -38,23 +38,17 @@
 /*****************************************************************************
  * VLAboutBox implementation
  *****************************************************************************/
-@implementation VLAboutBox
-
-static VLAboutBox *_o_sharedInstance = nil;
-
-+ (VLAboutBox *)sharedInstance
-{
-    return _o_sharedInstance ? _o_sharedInstance : [[self alloc] init];
-}
+@implementation AboutWindowController
 
 - (id)init
 {
-    if (_o_sharedInstance)
-        [self dealloc];
-    else
-        _o_sharedInstance = [super init];
+    self = [super initWithWindowNibName:@"About"];
+    if (self) {
+
+        [self setWindowFrameAutosaveName:@"about"];
+    }
 
-    return _o_sharedInstance;
+    return self;
 }
 
 - (void) dealloc
@@ -64,113 +58,13 @@ static VLAboutBox *_o_sharedInstance = nil;
     [super dealloc];
 }
 
-- (void)awakeFromNib
-{
-    if (!OSX_SNOW_LEOPARD)
-        [o_about_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
-}
-
 /*****************************************************************************
 * VLC About Window
 *****************************************************************************/
 
 - (void)showAbout
 {
-    if (! b_isSetUp) {
-        /* Get the localized info dictionary (InfoPlist.strings) */
-        NSDictionary *o_local_dict;
-        o_local_dict = [[NSBundle mainBundle] localizedInfoDictionary];
-
-        /* Setup the copyright field */
-        [o_copyright_field setStringValue: [o_local_dict objectForKey:@"NSHumanReadableCopyright"]];
-
-        /* l10n */
-        [o_about_window setTitle: _NS("About VLC media player")];
-        NSDictionary *stringAttributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:NSUnderlineStyleSingle], NSUnderlineStyleAttributeName, [NSColor colorWithCalibratedRed:0. green:0.3411 blue:0.6824 alpha:1.], NSForegroundColorAttributeName, [NSFont systemFontOfSize:13], NSFontAttributeName, nil];
-        NSAttributedString *attrStr;
-        attrStr = [[NSAttributedString alloc] initWithString:_NS("Credits") attributes:stringAttributes];
-        [o_credits_btn setAttributedTitle:attrStr];
-        [attrStr release];
-        attrStr = [[NSAttributedString alloc] initWithString:_NS("License") attributes:stringAttributes];
-        [o_gpl_btn setAttributedTitle:attrStr];
-        [attrStr release];
-        attrStr = [[NSAttributedString alloc] initWithString:_NS("Authors") attributes:stringAttributes];
-        [o_authors_btn setAttributedTitle:attrStr];
-        [attrStr release];
-        [o_trademarks_txt setStringValue:_NS("VLC media player and VideoLAN are trademarks of the VideoLAN Association.")];
-
-        /* setup the creator / revision field */
-        NSString *compiler;
-#ifdef __clang__
-        compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
-#else
-        compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
-#endif
-        [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
-
-        /* Setup the nameversion field */
-        [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VERSION_MESSAGE, PLATFORM]];
-
-        NSMutableArray *tmpArray = [NSMutableArray arrayWithArray: [[NSString stringWithUTF8String:psz_authors] componentsSeparatedByString:@"\n\n"]];
-        NSUInteger count = [tmpArray count];
-        for (NSUInteger i = 0; i < count; i++) {
-            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"\n" withString:@", "]];
-            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@", -" withString:@"\n-" options:0 range:NSRangeFromString(@"0 30")]];
-            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"-, " withString:@"-\n" options:0 range:NSRangeFromString(@"0 30")]];
-            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@","]]];
-        }
-        o_authors = [tmpArray componentsJoinedByString:@"\n\n"];
-        [o_authors retain];
-
-        /* setup join us! */
-        NSString *joinus = [NSString stringWithUTF8String:_(""
-                                                            "<p>VLC media player is a free and open source media player, encoder, and "
-                                                            "streamer made by the volunteers of the <a href=\"http://www.videolan.org/"
-                                                            "\"><span style=\" text-decoration: underline; color:#0057ae;\">VideoLAN</"
-                                                            "span></a> community.</p><p>VLC uses its internal codecs, works on "
-                                                            "essentially every popular platform, and can read almost all files, CDs, "
-                                                            "DVDs, network streams, capture cards and other media formats!</p><p><a href="
-                                                            "\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
-                                                            "underline; color:#0057ae;\">Help and join us!</span></a>")];
-        NSString *fontfamily;
-        if (OSX_YOSEMITE)
-            fontfamily = @"Helvetica Neue";
-        else
-            fontfamily = @"Lucida Grande";
-        NSString *joinUsWithStyle = [NSString stringWithFormat:@"<div style=\"text-align:left;font-family:%@;\">%@</div>",
-                                     fontfamily, joinus];
-        NSAttributedString *joinus_readytorender = [[NSAttributedString alloc] initWithHTML:[joinUsWithStyle dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES] options:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:NSUTF8StringEncoding] forKey:NSCharacterEncodingDocumentOption] documentAttributes:NULL];
-        [o_joinus_txt setAllowsEditingTextAttributes: YES];
-        [o_joinus_txt setSelectable: YES];
-        [o_joinus_txt setAttributedStringValue:joinus_readytorender];
-
-        [joinus_readytorender release];
-        [o_credits_textview setString: @""];
-
-        /* Setup the window */
-        [o_credits_textview setDrawsBackground: NO];
-        [o_credits_scrollview setDrawsBackground: NO];
-        [o_about_window setExcludedFromWindowsMenu:YES];
-        [o_about_window setMenu:nil];
-        [o_about_window center];
-        [o_about_window setBackgroundColor: [NSColor colorWithCalibratedWhite:.96 alpha:1.]];
-
-        if (config_GetInt(VLCIntf, "macosx-icon-change")) {
-            /* After day 354 of the year, the usual VLC cone is replaced by another cone
-             * wearing a Father Xmas hat.
-             * Note: this icon doesn't represent an endorsement of The Coca-Cola Company.
-             */
-            NSCalendar *gregorian =
-            [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
-            NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:[NSDate date]];
-            [gregorian release];
-
-            if (dayOfYear >= 354)
-                [o_icon_view setImage: [NSImage imageNamed:@"vlc-xmas"]];
-        }
-
-        b_isSetUp = YES;
-    }
+    [self window];
 
     /* Show the window */
     b_restart = YES;
@@ -181,7 +75,105 @@ static VLAboutBox *_o_sharedInstance = nil;
     [o_revision_field setHidden:NO];
     [o_name_version_field setHidden:NO];
     [o_credits_textview scrollPoint:NSMakePoint(0, 0)];
-    [o_about_window makeKeyAndOrderFront: nil];
+
+    [self showWindow:nil];
+}
+
+- (void)windowDidLoad
+{
+    if (!OSX_SNOW_LEOPARD)
+        [[self window] setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+
+    /* Get the localized info dictionary (InfoPlist.strings) */
+    NSDictionary *o_local_dict;
+    o_local_dict = [[NSBundle mainBundle] localizedInfoDictionary];
+
+    /* Setup the copyright field */
+    [o_copyright_field setStringValue: [o_local_dict objectForKey:@"NSHumanReadableCopyright"]];
+
+    /* l10n */
+    [[self window] setTitle: _NS("About VLC media player")];
+    NSDictionary *stringAttributes = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:NSUnderlineStyleSingle], NSUnderlineStyleAttributeName, [NSColor colorWithCalibratedRed:0. green:0.3411 blue:0.6824 alpha:1.], NSForegroundColorAttributeName, [NSFont systemFontOfSize:13], NSFontAttributeName, nil];
+    NSAttributedString *attrStr;
+    attrStr = [[NSAttributedString alloc] initWithString:_NS("Credits") attributes:stringAttributes];
+    [o_credits_btn setAttributedTitle:attrStr];
+    [attrStr release];
+    attrStr = [[NSAttributedString alloc] initWithString:_NS("License") attributes:stringAttributes];
+    [o_gpl_btn setAttributedTitle:attrStr];
+    [attrStr release];
+    attrStr = [[NSAttributedString alloc] initWithString:_NS("Authors") attributes:stringAttributes];
+    [o_authors_btn setAttributedTitle:attrStr];
+    [attrStr release];
+    [o_trademarks_txt setStringValue:_NS("VLC media player and VideoLAN are trademarks of the VideoLAN Association.")];
+
+    /* setup the creator / revision field */
+    NSString *compiler;
+#ifdef __clang__
+    compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
+#else
+    compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
+#endif
+    [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
+
+    /* Setup the nameversion field */
+    [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VERSION_MESSAGE, PLATFORM]];
+
+    NSMutableArray *tmpArray = [NSMutableArray arrayWithArray: [[NSString stringWithUTF8String:psz_authors] componentsSeparatedByString:@"\n\n"]];
+    NSUInteger count = [tmpArray count];
+    for (NSUInteger i = 0; i < count; i++) {
+        [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"\n" withString:@", "]];
+        [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@", -" withString:@"\n-" options:0 range:NSRangeFromString(@"0 30")]];
+        [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"-, " withString:@"-\n" options:0 range:NSRangeFromString(@"0 30")]];
+        [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@","]]];
+    }
+    o_authors = [tmpArray componentsJoinedByString:@"\n\n"];
+    [o_authors retain];
+
+    /* setup join us! */
+    NSString *joinus = [NSString stringWithUTF8String:_(""
+                                                        "<p>VLC media player is a free and open source media player, encoder, and "
+                                                        "streamer made by the volunteers of the <a href=\"http://www.videolan.org/"
+                                                        "\"><span style=\" text-decoration: underline; color:#0057ae;\">VideoLAN</"
+                                                        "span></a> community.</p><p>VLC uses its internal codecs, works on "
+                                                        "essentially every popular platform, and can read almost all files, CDs, "
+                                                        "DVDs, network streams, capture cards and other media formats!</p><p><a href="
+                                                        "\"http://www.videolan.org/contribute/\"><span style=\" text-decoration: "
+                                                        "underline; color:#0057ae;\">Help and join us!</span></a>")];
+    NSString *fontfamily;
+    if (OSX_YOSEMITE)
+        fontfamily = @"Helvetica Neue";
+    else
+        fontfamily = @"Lucida Grande";
+    NSString *joinUsWithStyle = [NSString stringWithFormat:@"<div style=\"text-align:left;font-family:%@;\">%@</div>",
+                                 fontfamily, joinus];
+    NSAttributedString *joinus_readytorender = [[NSAttributedString alloc] initWithHTML:[joinUsWithStyle dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES] options:[NSDictionary dictionaryWithObject:[NSNumber numberWithInt:NSUTF8StringEncoding] forKey:NSCharacterEncodingDocumentOption] documentAttributes:NULL];
+    [o_joinus_txt setAllowsEditingTextAttributes: YES];
+    [o_joinus_txt setSelectable: YES];
+    [o_joinus_txt setAttributedStringValue:joinus_readytorender];
+
+    [joinus_readytorender release];
+    [o_credits_textview setString: @""];
+
+    /* Setup the window */
+    [o_credits_textview setDrawsBackground: NO];
+    [o_credits_scrollview setDrawsBackground: NO];
+    [[self window] setExcludedFromWindowsMenu:YES];
+    [[self window] setMenu:nil];
+    [[self window] setBackgroundColor: [NSColor colorWithCalibratedWhite:.96 alpha:1.]];
+
+    if (config_GetInt(VLCIntf, "macosx-icon-change")) {
+        /* After day 354 of the year, the usual VLC cone is replaced by another cone
+         * wearing a Father Xmas hat.
+         * Note: this icon doesn't represent an endorsement of The Coca-Cola Company.
+         */
+        NSCalendar *gregorian =
+        [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar];
+        NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:[NSDate date]];
+        [gregorian release];
+
+        if (dayOfYear >= 354)
+            [o_icon_view setImage: [NSImage imageNamed:@"vlc-xmas"]];
+    }
 }
 
 - (void)windowDidBecomeKey:(NSNotification *)notification
@@ -258,21 +250,37 @@ static VLAboutBox *_o_sharedInstance = nil;
     [self buttonAction:nil];
 }
 
+@end
+
 /*****************************************************************************
-* VLC Generic Help Window
-*****************************************************************************/
+ * VLC Help Window Controller
+ *****************************************************************************/
 
-- (void)showHelp
+@implementation HelpWindowController
+
+- (id)init
 {
-    [o_help_window setTitle: _NS("VLC media player Help")];
+    self = [super initWithWindowNibName:@"Help"];
+    if (self) {
+
+        [self setWindowFrameAutosaveName:@"help"];
+    }
+
+    return self;
+}
+
+- (void)windowDidLoad
+{
+    [[self window] setTitle: _NS("VLC media player Help")];
     [o_help_fwd_btn setToolTip: _NS("Next")];
     [o_help_bwd_btn setToolTip: _NS("Previous")];
     [o_help_home_btn setToolTip: _NS("Index")];
+}
 
-    [o_help_window makeKeyAndOrderFront: self];
-
-    [[o_help_web_view mainFrame] loadHTMLString: _NS(I_LONGHELP)
-                                        baseURL: [NSURL URLWithString:@"http://videolan.org"]];
+- (void)showHelp
+{
+    [self showWindow:nil];
+    [self helpGoHome:nil];
 }
 
 - (IBAction)helpGoHome:(id)sender