diff --git a/macosx/FileOutlineController.h b/macosx/FileOutlineController.h
index 0c24fd288..6d6f119c6 100644
--- a/macosx/FileOutlineController.h
+++ b/macosx/FileOutlineController.h
@@ -47,6 +47,8 @@
 
 - (void) setCheck: (id) sender;
 - (void) setOnlySelectedCheck: (id) sender;
+- (void) checkAll;
+- (void) uncheckAll;
 - (void) setPriority: (id) sender;
 
 - (void) revealFile: (id) sender;
diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m
index 6d074b913..805860356 100644
--- a/macosx/FileOutlineController.m
+++ b/macosx/FileOutlineController.m
@@ -378,6 +378,20 @@ typedef enum
     [fOutline setNeedsDisplay: YES];
 }
 
+- (void) checkAll
+{
+    NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
+    [fTorrent setFileCheckState: NSOnState forIndexes: indexSet];
+    [fOutline setNeedsDisplay: YES];
+}
+
+- (void) uncheckAll
+{
+    NSIndexSet * indexSet = [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [fTorrent fileCount])];
+    [fTorrent setFileCheckState: NSOffState forIndexes: indexSet];
+    [fOutline setNeedsDisplay: YES];
+}
+
 - (void) setPriority: (id) sender
 {
     tr_priority_t priority;
diff --git a/macosx/InfoFileView.xib b/macosx/InfoFileView.xib
index 9b6b231c0..64be73dee 100644
--- a/macosx/InfoFileView.xib
+++ b/macosx/InfoFileView.xib
@@ -2,19 +2,20 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
 	<data>
 		<int key="IBDocument.SystemTarget">1060</int>
-		<string key="IBDocument.SystemVersion">11B26</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
-		<string key="IBDocument.AppKitVersion">1138</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<string key="IBDocument.SystemVersion">11E53</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.47</string>
+		<string key="IBDocument.HIToolboxVersion">569.00</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-			<string key="NS.object.0">1617</string>
+			<string key="NS.object.0">2182</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
 			<string>NSTextFieldCell</string>
 			<string>NSOutlineView</string>
 			<string>NSScrollView</string>
 			<string>NSSearchField</string>
+			<string>NSButton</string>
 			<string>NSCustomView</string>
 			<string>NSButtonCell</string>
 			<string>NSTableColumn</string>
@@ -25,7 +26,10 @@
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 		</array>
-		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<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="1000">
 			<object class="NSCustomObject" id="1001">
 				<string key="NSClassName">InfoFileViewController</string>
@@ -37,9 +41,61 @@
 				<string key="NSClassName">NSApplication</string>
 			</object>
 			<object class="NSCustomView" id="30097843">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<array class="NSMutableArray" key="NSSubviews">
+					<object class="NSButton" id="38777799">
+						<reference key="NSNextResponder" ref="30097843"/>
+						<int key="NSvFlags">289</int>
+						<string key="NSFrame">{{238, 10}, {42, 17}}</string>
+						<reference key="NSSuperview" ref="30097843"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="752853209"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="788427236">
+							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags2">134348800</int>
+							<string key="NSContents">All</string>
+							<object class="NSFont" key="NSSupport" id="26">
+								<string key="NSName">LucidaGrande</string>
+								<double key="NSSize">11</double>
+								<int key="NSfFlags">3100</int>
+							</object>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="38777799"/>
+							<int key="NSButtonFlags">-2038152961</int>
+							<int key="NSButtonFlags2">164</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+					</object>
+					<object class="NSButton" id="752853209">
+						<reference key="NSNextResponder" ref="30097843"/>
+						<int key="NSvFlags">289</int>
+						<string key="NSFrame">{{288, 10}, {42, 17}}</string>
+						<reference key="NSSuperview" ref="30097843"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView"/>
+						<string key="NSReuseIdentifierKey">_NS:9</string>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSButtonCell" key="NSCell" id="544969693">
+							<int key="NSCellFlags">-2080244224</int>
+							<int key="NSCellFlags2">134348800</int>
+							<string key="NSContents">None</string>
+							<reference key="NSSupport" ref="26"/>
+							<string key="NSCellIdentifier">_NS:9</string>
+							<reference key="NSControlView" ref="752853209"/>
+							<int key="NSButtonFlags">-2038152961</int>
+							<int key="NSButtonFlags2">164</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+						</object>
+					</object>
 					<object class="NSScrollView" id="850988097">
 						<reference key="NSNextResponder" ref="30097843"/>
 						<int key="NSvFlags">274</int>
@@ -53,6 +109,8 @@
 										<int key="NSvFlags">256</int>
 										<string key="NSFrameSize">{318, 324}</string>
 										<reference key="NSSuperview" ref="95499405"/>
+										<reference key="NSWindow"/>
+										<reference key="NSNextKeyView" ref="205767664"/>
 										<bool key="NSEnabled">YES</bool>
 										<object class="_NSCornerView" key="NSCornerView">
 											<nil key="NSNextResponder"/>
@@ -69,11 +127,7 @@
 													<int key="NSCellFlags">75628096</int>
 													<int key="NSCellFlags2">2048</int>
 													<string key="NSContents">Name</string>
-													<object class="NSFont" key="NSSupport" id="26">
-														<string key="NSName">LucidaGrande</string>
-														<double key="NSSize">11</double>
-														<int key="NSfFlags">3100</int>
-													</object>
+													<reference key="NSSupport" ref="26"/>
 													<object class="NSColor" key="NSBackgroundColor">
 														<int key="NSColorSpace">3</int>
 														<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
@@ -212,6 +266,7 @@
 								</array>
 								<string key="NSFrame">{{1, 1}, {318, 324}}</string>
 								<reference key="NSSuperview" ref="850988097"/>
+								<reference key="NSWindow"/>
 								<reference key="NSNextKeyView" ref="553375370"/>
 								<reference key="NSDocView" ref="553375370"/>
 								<reference key="NSBGColor" ref="576649451"/>
@@ -222,6 +277,8 @@
 								<int key="NSvFlags">256</int>
 								<string key="NSFrame">{{304, 1}, {15, 324}}</string>
 								<reference key="NSSuperview" ref="850988097"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="558986626"/>
 								<reference key="NSTarget" ref="850988097"/>
 								<string key="NSAction">_doScroller:</string>
 								<double key="NSPercent">0.99692307692307691</double>
@@ -231,6 +288,8 @@
 								<int key="NSvFlags">-2147483392</int>
 								<string key="NSFrame">{{-100, -100}, {328, 15}}</string>
 								<reference key="NSSuperview" ref="850988097"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="95499405"/>
 								<int key="NSsFlags">1</int>
 								<reference key="NSTarget" ref="850988097"/>
 								<string key="NSAction">_doScroller:</string>
@@ -239,7 +298,8 @@
 						</array>
 						<string key="NSFrame">{{10, 34}, {320, 326}}</string>
 						<reference key="NSSuperview" ref="30097843"/>
-						<reference key="NSNextKeyView" ref="95499405"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="401920833"/>
 						<int key="NSsFlags">133138</int>
 						<reference key="NSVScroller" ref="205767664"/>
 						<reference key="NSHScroller" ref="401920833"/>
@@ -251,6 +311,8 @@
 						<int key="NSvFlags">292</int>
 						<string key="NSFrame">{{10, 10}, {110, 19}}</string>
 						<reference key="NSSuperview" ref="30097843"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="38777799"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSearchFieldCell" key="NSCell" id="28724714">
 							<int key="NSCellFlags">343014976</int>
@@ -305,6 +367,9 @@
 					</object>
 				</array>
 				<string key="NSFrameSize">{340, 365}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<reference key="NSNextKeyView" ref="850988097"/>
 				<object class="NSMutableString" key="NSClassName">
 					<characters key="NS.bytes">NSView</characters>
 				</object>
@@ -324,30 +389,6 @@
 					</object>
 					<int key="connectionID">16</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fOutline</string>
-						<reference key="source" ref="576026135"/>
-						<reference key="destination" ref="553375370"/>
-					</object>
-					<int key="connectionID">18</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">dataSource</string>
-						<reference key="source" ref="553375370"/>
-						<reference key="destination" ref="576026135"/>
-					</object>
-					<int key="connectionID">19</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="553375370"/>
-						<reference key="destination" ref="576026135"/>
-					</object>
-					<int key="connectionID">20</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">setFileFilterText:</string>
@@ -372,6 +413,62 @@
 					</object>
 					<int key="connectionID">24</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">checkAll:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="38777799"/>
+					</object>
+					<int key="connectionID">29</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">uncheckAll:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="752853209"/>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fCheckAllButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="38777799"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fUncheckAllButton</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="752853209"/>
+					</object>
+					<int key="connectionID">32</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="553375370"/>
+						<reference key="destination" ref="576026135"/>
+					</object>
+					<int key="connectionID">19</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="553375370"/>
+						<reference key="destination" ref="576026135"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fOutline</string>
+						<reference key="source" ref="576026135"/>
+						<reference key="destination" ref="553375370"/>
+					</object>
+					<int key="connectionID">18</int>
+				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<array key="orderedObjects">
@@ -405,6 +502,8 @@
 						<array class="NSMutableArray" key="children">
 							<reference ref="558986626"/>
 							<reference ref="850988097"/>
+							<reference ref="752853209"/>
+							<reference ref="38777799"/>
 						</array>
 						<reference key="parent" ref="0"/>
 						<string key="objectName">Files</string>
@@ -497,6 +596,32 @@
 						<reference key="parent" ref="0"/>
 						<string key="objectName">File Outline Controller</string>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="752853209"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="544969693"/>
+						</array>
+						<reference key="parent" ref="30097843"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="544969693"/>
+						<reference key="parent" ref="752853209"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="38777799"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="788427236"/>
+						</array>
+						<reference key="parent" ref="30097843"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="788427236"/>
+						<reference key="parent" ref="38777799"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -512,6 +637,10 @@
 				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -527,9 +656,90 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">24</int>
+			<int key="maxID">32</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">FileOutlineController</string>
+					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">fOutline</string>
+						<string key="NS.object.0">FileOutlineView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">fOutline</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">fOutline</string>
+							<string key="candidateClassName">FileOutlineView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FileOutlineController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">FileOutlineView</string>
+					<string key="superclassName">NSOutlineView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/FileOutlineView.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">InfoFileViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="checkAll:">id</string>
+						<string key="setFileFilterText:">id</string>
+						<string key="uncheckAll:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="checkAll:">
+							<string key="name">checkAll:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="setFileFilterText:">
+							<string key="name">setFileFilterText:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="uncheckAll:">
+							<string key="name">uncheckAll:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="fCheckAllButton">NSButton</string>
+						<string key="fFileController">FileOutlineController</string>
+						<string key="fFileFilterField">NSSearchField</string>
+						<string key="fUncheckAllButton">NSButton</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="fCheckAllButton">
+							<string key="name">fCheckAllButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fFileController">
+							<string key="name">fFileController</string>
+							<string key="candidateClassName">FileOutlineController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fFileFilterField">
+							<string key="name">fFileFilterField</string>
+							<string key="candidateClassName">NSSearchField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="fUncheckAllButton">
+							<string key="name">fUncheckAllButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/InfoFileViewController.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
@@ -538,7 +748,7 @@
 		</object>
 		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
 			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-			<integer value="1060" key="NS.object.0"/>
+			<real value="1070" key="NS.object.0"/>
 		</object>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
diff --git a/macosx/InfoFileViewController.h b/macosx/InfoFileViewController.h
index 265b45073..c19f4b131 100644
--- a/macosx/InfoFileViewController.h
+++ b/macosx/InfoFileViewController.h
@@ -37,6 +37,7 @@
     IBOutlet FileOutlineController * fFileController;
     
     IBOutlet NSSearchField * fFileFilterField;
+    IBOutlet NSButton * fCheckAllButton, *fUncheckAllButton;
 }
 
 - (void) setInfoForTorrents: (NSArray *) torrents;
@@ -44,7 +45,9 @@
 
 - (void) saveViewSize;
 
-- (void) setFileFilterText: (id) sender;
+- (IBAction) setFileFilterText: (id) sender;
+- (IBAction) checkAll: (id) sender;
+- (IBAction) uncheckAll: (id) sender;
 
 - (NSArray *) quickLookURLs;
 - (BOOL) canQuickLook;
diff --git a/macosx/InfoFileViewController.m b/macosx/InfoFileViewController.m
index 94df61dc2..8a9e54e21 100644
--- a/macosx/InfoFileViewController.m
+++ b/macosx/InfoFileViewController.m
@@ -83,7 +83,17 @@
         [self setupInfo];
     
     if ([fTorrents count] == 1)
+    {
         [fFileController refresh];
+        
+        Torrent * torrent = [fTorrents objectAtIndex: 0];
+        if ([torrent isFolder])
+        {
+            const NSInteger filesCheckState = [torrent checkForFiles: [NSIndexSet indexSetWithIndexesInRange: NSMakeRange(0, [torrent fileCount])]];
+            [fCheckAllButton setEnabled: filesCheckState != NSOnState]; //if anything is unchecked
+            [fUncheckAllButton setEnabled: ![torrent allDownloaded]]; //if there are any checked files that aren't finished
+        }
+    }
 }
 
 - (void) saveViewSize
@@ -96,6 +106,16 @@
     [fFileController setFilterText: [sender stringValue]];
 }
 
+- (IBAction) checkAll: (id) sender
+{
+    [fFileController checkAll];
+}
+
+- (IBAction) uncheckAll: (id) sender
+{
+    [fFileController uncheckAll];
+}
+
 - (NSArray *) quickLookURLs
 {
     FileOutlineView * fileOutlineView = [fFileController outlineView];
@@ -173,12 +193,24 @@
         Torrent * torrent = [fTorrents objectAtIndex: 0];
         
         [fFileController setTorrent: torrent];
-        [fFileFilterField setEnabled: [torrent isFolder]];
+        
+        const BOOL isFolder = [torrent isFolder];
+        [fFileFilterField setEnabled: isFolder];
+        
+        if (!isFolder)
+        {
+            [fCheckAllButton setEnabled: NO];
+            [fUncheckAllButton setEnabled: NO];
+        }
     }
     else
     {
         [fFileController setTorrent: nil];
+        
         [fFileFilterField setEnabled: NO];
+        
+        [fCheckAllButton setEnabled: NO];
+        [fUncheckAllButton setEnabled: NO];
     }
     
     fSet = YES;