diff --git a/macosx/Controller.m b/macosx/Controller.m
index 70150fad9..e2681aa91 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -203,7 +203,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         
         fLib = tr_sessionInitFull(NULL, /* use default config directory (Application Support) */
                                 "macosx",
-                                NULL, /* download directory set when adding transfers */
+                                "", /* download directory set when adding transfers */
                                 [fDefaults boolForKey: @"PEXGlobal"],
                                 [fDefaults boolForKey: @"NatTraversal"],
                                 [fDefaults integerForKey: @"BindPort"],
@@ -225,6 +225,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
                                 [[fDefaults stringForKey: @"RPCPassword"] UTF8String],
                                 [fDefaults boolForKey: @"Proxy"],
                                 [[fDefaults stringForKey: @"ProxyAddress"] UTF8String],
+                                TR_DEFAULT_PROXY_TYPE, /* reset in prefs */
                                 [fDefaults boolForKey: @"ProxyAuthorize"],
                                 [[fDefaults stringForKey: @"ProxyUsername"] UTF8String],
                                 [[fDefaults stringForKey: @"ProxyPassword"] UTF8String]);
diff --git a/macosx/Defaults.plist b/macosx/Defaults.plist
index e5f0e9420..1d82ed4ee 100644
--- a/macosx/Defaults.plist
+++ b/macosx/Defaults.plist
@@ -108,6 +108,8 @@
 	<false/>
 	<key>ProxyPassword</key>
 	<string></string>
+	<key>ProxyType</key>
+	<string>HTTP</string>
 	<key>ProxyUsername</key>
 	<string></string>
 	<key>Queue</key>
diff --git a/macosx/English.lproj/Localizable.strings b/macosx/English.lproj/Localizable.strings
index f25016944..758114819 100644
Binary files a/macosx/English.lproj/Localizable.strings and b/macosx/English.lproj/Localizable.strings differ
diff --git a/macosx/English.lproj/PrefsWindow.xib b/macosx/English.lproj/PrefsWindow.xib
index e2f8e3eb5..c12dda99d 100644
--- a/macosx/English.lproj/PrefsWindow.xib
+++ b/macosx/English.lproj/PrefsWindow.xib
@@ -8,8 +8,6 @@
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1481"/>
-			<integer value="1361"/>
 			<integer value="66"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
@@ -361,7 +359,7 @@
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="314557528">
-				<nil key="NSNextResponder"/>
+				<reference key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -370,6 +368,7 @@
 						<int key="NSvFlags">256</int>
 						<string key="NSFrame">{{13, 10}, {509, 272}}</string>
 						<reference key="NSSuperview" ref="314557528"/>
+						<reference key="NSWindow"/>
 						<object class="NSMutableArray" key="NSTabViewItems">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="NSTabViewItem" id="73412354">
@@ -383,6 +382,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{280, 192}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="90676977">
 												<int key="NSCellFlags">-2076049856</int>
@@ -486,6 +486,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{104, 198}, {174, 17}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="17039439">
 												<int key="NSCellFlags">67239424</int>
@@ -502,6 +503,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{40, 198}, {62, 17}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="928268714">
 												<int key="NSCellFlags">67239424</int>
@@ -518,6 +520,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{105, 129}, {188, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="617366714">
 												<int key="NSCellFlags">67239424</int>
@@ -540,6 +543,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{105, 19}, {181, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="43391012">
 												<int key="NSCellFlags">67239424</int>
@@ -562,6 +566,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{289, 14}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="325815098">
 												<int key="NSCellFlags">-2076049856</int>
@@ -634,6 +639,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{36, 20}, {66, 17}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="89538612">
 												<int key="NSCellFlags">67239424</int>
@@ -650,6 +656,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{105, 172}, {178, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="631844593">
 												<int key="NSCellFlags">67239424</int>
@@ -672,6 +679,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{286, 167}, {182, 26}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSPopUpButtonCell" key="NSCell" id="706439761">
 												<int key="NSCellFlags">-2076049856</int>
@@ -744,6 +752,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{105, 93}, {283, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="737399332">
 												<int key="NSCellFlags">67239424</int>
@@ -766,6 +775,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{105, 149}, {192, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="698939556">
 												<int key="NSCellFlags">67239424</int>
@@ -788,6 +798,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{124, 53}, {197, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="728696603">
 												<int key="NSCellFlags">67239424</int>
@@ -810,6 +821,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{17, 94}, {86, 17}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSTextFieldCell" key="NSCell" id="184279790">
 												<int key="NSCellFlags">67239424</int>
@@ -826,6 +838,7 @@
 											<int key="NSvFlags">256</int>
 											<string key="NSFrame">{{124, 73}, {235, 18}}</string>
 											<reference key="NSSuperview" ref="833882848"/>
+											<reference key="NSWindow"/>
 											<bool key="NSEnabled">YES</bool>
 											<object class="NSButtonCell" key="NSCell" id="735010614">
 												<int key="NSCellFlags">67239424</int>
@@ -846,6 +859,7 @@
 									</object>
 									<string key="NSFrame">{{10, 33}, {489, 226}}</string>
 									<reference key="NSSuperview" ref="463462813"/>
+									<reference key="NSWindow"/>
 								</object>
 								<string key="NSLabel">Adding</string>
 								<reference key="NSColor" ref="977951849"/>
@@ -1515,6 +1529,8 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{535, 288}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -2118,7 +2134,7 @@ AAABAAAAAQ</bytes>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="538122014">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2531,7 +2547,6 @@ AAABAAAAAQ</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{535, 258}</string>
-				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
@@ -2566,7 +2581,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="631967205">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{52, 34}, {90, 17}}</string>
+						<string key="NSFrame">{{28, 34}, {90, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="514153614">
@@ -2582,7 +2597,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="109684042">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{145, 33}, {357, 18}}</string>
+						<string key="NSFrame">{{121, 33}, {357, 18}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="127446013">
@@ -2605,7 +2620,7 @@ AAABAAAAAQ</bytes>
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">1280</int>
 						<object class="NSPSMatrix" key="NSDrawMatrix"/>
-						<string key="NSFrame">{{317, 253}, {16, 16}}</string>
+						<string key="NSFrame">{{293, 253}, {16, 16}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<int key="NSpiFlags">28938</int>
 						<double key="NSMaxValue">1.000000e+02</double>
@@ -2625,7 +2640,7 @@ AAABAAAAAQ</bytes>
 								<string>NeXT TIFF v4.0 pasteboard type</string>
 							</object>
 						</object>
-						<string key="NSFrame">{{318, 254}, {14, 14}}</string>
+						<string key="NSFrame">{{294, 254}, {14, 14}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="270102740">
@@ -2645,7 +2660,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="585772012">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{132, 253}, {124, 17}}</string>
+						<string key="NSFrame">{{108, 253}, {124, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="941628063">
@@ -2661,7 +2676,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="316696878">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{133, 231}, {171, 18}}</string>
+						<string key="NSFrame">{{109, 231}, {171, 18}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="633401664">
@@ -2683,7 +2698,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="622323577">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{133, 174}, {248, 18}}</string>
+						<string key="NSFrame">{{109, 174}, {248, 18}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="20752657">
@@ -2705,7 +2720,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="911608268">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{261, 251}, {50, 22}}</string>
+						<string key="NSFrame">{{237, 251}, {50, 22}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="453443006">
@@ -2771,7 +2786,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="646636981">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{132, 215}, {238, 14}}</string>
+						<string key="NSFrame">{{108, 215}, {238, 14}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="67017561">
@@ -2787,7 +2802,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="992746122">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{337, 253}, {154, 17}}</string>
+						<string key="NSFrame">{{313, 253}, {154, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="931894024">
@@ -2803,7 +2818,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="25993221">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{69, 254}, {61, 17}}</string>
+						<string key="NSFrame">{{45, 254}, {61, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="475516915">
@@ -2819,13 +2834,13 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="90035294">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{33, 175}, {97, 17}}</string>
+						<string key="NSFrame">{{62, 175}, {44, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="582281809">
 							<int key="NSCellFlags">67239424</int>
 							<int key="NSCellFlags2">71303168</int>
-							<string key="NSContents">Tracker proxy:</string>
+							<string key="NSContents">Proxy:</string>
 							<reference key="NSSupport" ref="86725571"/>
 							<reference key="NSControlView" ref="90035294"/>
 							<reference key="NSBackgroundColor" ref="977951849"/>
@@ -2835,7 +2850,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="185775633">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{242, 147}, {184, 22}}</string>
+						<string key="NSFrame">{{218, 147}, {184, 22}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="1051431853">
@@ -2852,7 +2867,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="257109686">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{174, 73}, {68, 17}}</string>
+						<string key="NSFrame">{{150, 73}, {68, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="954130018">
@@ -2868,7 +2883,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="925265526">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{171, 101}, {71, 17}}</string>
+						<string key="NSFrame">{{147, 101}, {71, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="108838744">
@@ -2884,7 +2899,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="995948995">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{151, 149}, {86, 17}}</string>
+						<string key="NSFrame">{{127, 149}, {86, 17}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="677732006">
@@ -2900,7 +2915,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSButton" id="473194484">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{152, 125}, {187, 18}}</string>
+						<string key="NSFrame">{{128, 125}, {187, 18}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="296153825">
@@ -2922,7 +2937,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSSecureTextField" id="1043027599">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{247, 71}, {179, 22}}</string>
+						<string key="NSFrame">{{223, 71}, {179, 22}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSSecureTextFieldCell" key="NSCell" id="669471795">
@@ -2943,7 +2958,7 @@ AAABAAAAAQ</bytes>
 					<object class="NSTextField" id="876018656">
 						<reference key="NSNextResponder" ref="204700639"/>
 						<int key="NSvFlags">256</int>
-						<string key="NSFrame">{{247, 99}, {179, 22}}</string>
+						<string key="NSFrame">{{223, 99}, {179, 22}}</string>
 						<reference key="NSSuperview" ref="204700639"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="731460553">
@@ -2957,6 +2972,71 @@ AAABAAAAAQ</bytes>
 							<reference key="NSTextColor" ref="430340990"/>
 						</object>
 					</object>
+					<object class="NSPopUpButton" id="682100624">
+						<reference key="NSNextResponder" ref="204700639"/>
+						<int key="NSvFlags">268</int>
+						<string key="NSFrame">{{407, 145}, {96, 26}}</string>
+						<reference key="NSSuperview" ref="204700639"/>
+						<bool key="NSEnabled">YES</bool>
+						<object class="NSPopUpButtonCell" key="NSCell" id="512042046">
+							<int key="NSCellFlags">-2076049856</int>
+							<int key="NSCellFlags2">2048</int>
+							<reference key="NSSupport" ref="86725571"/>
+							<reference key="NSControlView" ref="682100624"/>
+							<int key="NSButtonFlags">109199615</int>
+							<int key="NSButtonFlags2">129</int>
+							<string key="NSAlternateContents"/>
+							<string key="NSKeyEquivalent"/>
+							<int key="NSPeriodicDelay">400</int>
+							<int key="NSPeriodicInterval">75</int>
+							<object class="NSMenuItem" key="NSMenuItem" id="121411742">
+								<reference key="NSMenu" ref="847827596"/>
+								<string key="NSTitle">HTTP</string>
+								<string key="NSKeyEquiv"/>
+								<int key="NSKeyEquivModMask">1048576</int>
+								<int key="NSMnemonicLoc">2147483647</int>
+								<int key="NSState">1</int>
+								<reference key="NSOnImage" ref="550412468"/>
+								<reference key="NSMixedImage" ref="32510707"/>
+								<string key="NSAction">_popUpItemAction:</string>
+								<reference key="NSTarget" ref="512042046"/>
+							</object>
+							<bool key="NSMenuItemRespectAlignment">YES</bool>
+							<object class="NSMenu" key="NSMenu" id="847827596">
+								<string key="NSTitle">OtherViews</string>
+								<object class="NSMutableArray" key="NSMenuItems">
+									<bool key="EncodedWithXMLCoder">YES</bool>
+									<reference ref="121411742"/>
+									<object class="NSMenuItem" id="37580132">
+										<reference key="NSMenu" ref="847827596"/>
+										<string key="NSTitle">SOCKS4</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSKeyEquivModMask">1048576</int>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="550412468"/>
+										<reference key="NSMixedImage" ref="32510707"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<reference key="NSTarget" ref="512042046"/>
+									</object>
+									<object class="NSMenuItem" id="935614302">
+										<reference key="NSMenu" ref="847827596"/>
+										<string key="NSTitle">SOCKS5</string>
+										<string key="NSKeyEquiv"/>
+										<int key="NSKeyEquivModMask">1048576</int>
+										<int key="NSMnemonicLoc">2147483647</int>
+										<reference key="NSOnImage" ref="550412468"/>
+										<reference key="NSMixedImage" ref="32510707"/>
+										<string key="NSAction">_popUpItemAction:</string>
+										<reference key="NSTarget" ref="512042046"/>
+									</object>
+								</object>
+							</object>
+							<int key="NSPreferredEdge">1</int>
+							<bool key="NSUsesItemFromMenu">YES</bool>
+							<bool key="NSAltersState">YES</bool>
+							<int key="NSArrowPosition">2</int>
+						</object>
+					</object>
 				</object>
 				<string key="NSFrameSize">{535, 293}</string>
 				<reference key="NSSuperview"/>
@@ -2964,7 +3044,7 @@ AAABAAAAAQ</bytes>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSCustomView" id="810116101">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">256</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3332,7 +3412,6 @@ AAABAAAAAQ</bytes>
 								</object>
 								<string key="NSFrame">{{1, 17}, {332, 95}}</string>
 								<reference key="NSSuperview" ref="122119447"/>
-								<reference key="NSNextKeyView" ref="173651346"/>
 								<reference key="NSDocView" ref="173651346"/>
 								<reference key="NSBGColor" ref="729660797"/>
 								<int key="NScvFlags">4</int>
@@ -3365,7 +3444,6 @@ AAABAAAAAQ</bytes>
 								</object>
 								<string key="NSFrame">{{1, 0}, {332, 17}}</string>
 								<reference key="NSSuperview" ref="122119447"/>
-								<reference key="NSNextKeyView" ref="520862816"/>
 								<reference key="NSDocView" ref="520862816"/>
 								<reference key="NSBGColor" ref="729660797"/>
 								<int key="NScvFlags">4</int>
@@ -3374,7 +3452,6 @@ AAABAAAAAQ</bytes>
 						</object>
 						<string key="NSFrame">{{102, 63}, {349, 113}}</string>
 						<reference key="NSSuperview" ref="810116101"/>
-						<reference key="NSNextKeyView" ref="206862330"/>
 						<int key="NSsFlags">18</int>
 						<reference key="NSVScroller" ref="220703981"/>
 						<reference key="NSHScroller" ref="383062716"/>
@@ -3476,11 +3553,14 @@ AAABAAAAAQ</bytes>
 					</object>
 				</object>
 				<string key="NSFrameSize">{535, 403}</string>
-				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 				<string key="NSExtension">NSResponder</string>
 			</object>
 			<object class="NSUserDefaultsController" id="356871564">
+				<object class="NSMutableArray" key="NSDeclaredKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>Proxy</string>
+				</object>
 				<bool key="NSSharedInstance">YES</bool>
 			</object>
 		</object>
@@ -5842,6 +5922,38 @@ AAABAAAAAQ</bytes>
 					</object>
 					<int key="connectionID">1662</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fProxyTypePopUp</string>
+						<reference key="source" ref="511492310"/>
+						<reference key="destination" ref="682100624"/>
+					</object>
+					<int key="connectionID">1669</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">setProxyType:</string>
+						<reference key="source" ref="511492310"/>
+						<reference key="destination" ref="682100624"/>
+					</object>
+					<int key="connectionID">1670</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">enabled: values.Proxy</string>
+						<reference key="source" ref="682100624"/>
+						<reference key="destination" ref="356871564"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="682100624"/>
+							<reference key="NSDestination" ref="356871564"/>
+							<string key="NSLabel">enabled: values.Proxy</string>
+							<string key="NSBinding">enabled</string>
+							<string key="NSKeyPath">values.Proxy</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">1671</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -6346,6 +6458,7 @@ AAABAAAAAQ</bytes>
 							<reference ref="1043027599"/>
 							<reference ref="876018656"/>
 							<reference ref="995948995"/>
+							<reference ref="682100624"/>
 						</object>
 						<reference key="parent" ref="37013934"/>
 						<string key="objectName">Network</string>
@@ -8074,6 +8187,50 @@ AAABAAAAAQ</bytes>
 						<reference key="object" ref="803023037"/>
 						<reference key="parent" ref="749999527"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1663</int>
+						<reference key="object" ref="682100624"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="512042046"/>
+						</object>
+						<reference key="parent" ref="204700639"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1664</int>
+						<reference key="object" ref="512042046"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="847827596"/>
+						</object>
+						<reference key="parent" ref="682100624"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1665</int>
+						<reference key="object" ref="847827596"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="121411742"/>
+							<reference ref="37580132"/>
+							<reference ref="935614302"/>
+						</object>
+						<reference key="parent" ref="512042046"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1666</int>
+						<reference key="object" ref="121411742"/>
+						<reference key="parent" ref="847827596"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1667</int>
+						<reference key="object" ref="37580132"/>
+						<reference key="parent" ref="847827596"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1668</int>
+						<reference key="object" ref="935614302"/>
+						<reference key="parent" ref="847827596"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -8246,6 +8403,13 @@ AAABAAAAAQ</bytes>
 					<string>1657.ImportedFromIB2</string>
 					<string>1660.IBPluginDependency</string>
 					<string>1661.IBPluginDependency</string>
+					<string>1663.IBPluginDependency</string>
+					<string>1664.IBPluginDependency</string>
+					<string>1665.IBEditorWindowLastContentRect</string>
+					<string>1665.IBPluginDependency</string>
+					<string>1666.IBPluginDependency</string>
+					<string>1667.IBPluginDependency</string>
+					<string>1668.IBPluginDependency</string>
 					<string>190.IBPluginDependency</string>
 					<string>190.ImportedFromIB2</string>
 					<string>192.IBPluginDependency</string>
@@ -8612,6 +8776,13 @@ AAABAAAAAQ</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>{{667, 478}, {123, 63}}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="761722050"/>
@@ -8836,7 +9007,7 @@ AAABAAAAAQ</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">1662</int>
+			<int key="maxID">1671</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -8950,6 +9121,7 @@ AAABAAAAAQ</bytes>
 							<string>setProxyAuthorize:</string>
 							<string>setProxyEnabled:</string>
 							<string>setProxyPassword:</string>
+							<string>setProxyType:</string>
 							<string>setProxyUsername:</string>
 							<string>setQueue:</string>
 							<string>setQueueNumber:</string>
@@ -9009,6 +9181,7 @@ AAABAAAAAQ</bytes>
 							<string>id</string>
 							<string>id</string>
 							<string>id</string>
+							<string>id</string>
 						</object>
 					</object>
 					<object class="NSMutableDictionary" key="outlets">
@@ -9033,6 +9206,7 @@ AAABAAAAAQ</bytes>
 							<string>fPortStatusImage</string>
 							<string>fPortStatusProgress</string>
 							<string>fProxyAddressField</string>
+							<string>fProxyTypePopUp</string>
 							<string>fQueueDownloadField</string>
 							<string>fQueueSeedField</string>
 							<string>fRPCAccessTable</string>
@@ -9066,6 +9240,7 @@ AAABAAAAAQ</bytes>
 							<string>NSImageView</string>
 							<string>NSProgressIndicator</string>
 							<string>NSTextField</string>
+							<string>NSPopUpButton</string>
 							<string>NSTextField</string>
 							<string>NSTextField</string>
 							<string>NSTableView</string>
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 1185022dc..e949de58a 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -57,6 +57,7 @@
     NSTimer * fPortStatusTimer;
     int fPeerPort, fNatStatus;
     IBOutlet NSTextField * fProxyAddressField;
+    IBOutlet NSPopUpButton * fProxyTypePopUp;
     
     IBOutlet NSTextField * fRPCPortField;
     IBOutlet NSTableView * fRPCAccessTable;
@@ -124,6 +125,8 @@
 - (void) setProxyAuthorize: (id) sender;
 - (void) setProxyUsername: (id) sender;
 - (void) setProxyPassword: (id) sender;
+- (void) setProxyType: (id) sender;
+- (void) updateProxyType;
 
 - (void) setRPCEnabled: (id) sender;
 - (void) setRPCAuthorize: (id) sender;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index e2e91006c..a9a46b944 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -31,6 +31,10 @@
 #define DOWNLOAD_FOLDER     0
 #define DOWNLOAD_TORRENT    2
 
+#define PROXY_HTTP      0
+#define PROXY_SOCKS4    1
+#define PROXY_SOCKS5    2
+
 #define RPC_ACCESS_ALLOW    0
 #define RPC_ACCESS_DENY     1
 
@@ -101,6 +105,9 @@
         //actually set bandwidth limits
         [self applySpeedSettings: nil];
         
+        //set proxy type
+        [self updateProxyType];
+        
         //update rpc access list
         fRPCAccessArray = [[fDefaults arrayForKey: @"RPCAccessList"] mutableCopy];
         if (!fRPCAccessArray)
@@ -184,8 +191,21 @@
     [fQueueSeedField setIntValue: [fDefaults integerForKey: @"QueueSeedNumber"]];
     [fStalledField setIntValue: [fDefaults integerForKey: @"StalledMinutes"]];
     
-    //set proxy address
+    //set proxy fields
     [fProxyAddressField setStringValue: [fDefaults stringForKey: @"ProxyAddress"]];
+    int proxyType;
+    switch(tr_sessionGetProxyType(fHandle))
+    {
+        case TR_PROXY_SOCKS4:
+            proxyType = PROXY_SOCKS4;
+            break;
+        case TR_PROXY_SOCKS5:
+            proxyType = PROXY_SOCKS5;
+            break;
+        case TR_PROXY_HTTP:
+            proxyType = PROXY_HTTP;
+    }
+    [fProxyTypePopUp selectItemAtIndex: proxyType];
     
     //set blocklist
     [self updateBlocklistFields];
@@ -689,6 +709,47 @@
     tr_sessionSetProxyPassword(fHandle, [[fDefaults stringForKey: @"ProxyPassword"] UTF8String]);
 }
 
+- (void) setProxyType: (id) sender
+{
+    NSString * type;
+    switch ([sender indexOfSelectedItem])
+    {
+        case PROXY_HTTP:
+            type = @"HTTP";
+            break;
+        case PROXY_SOCKS4:
+            type = @"SOCKS4";
+            break;
+        case PROXY_SOCKS5:
+            type = @"SOCKS5";
+    }
+    
+    [fDefaults setObject: type forKey: @"ProxyType"];
+    [self updateProxyType];
+}
+
+- (void) updateProxyType
+{
+    NSString * typeString = [fDefaults stringForKey: @"ProxyType"];
+    tr_proxy_type type;
+    if ([typeString isEqualToString: @"SOCKS4"])
+        type = TR_PROXY_SOCKS4;
+    else if ([typeString isEqualToString: @"SOCKS5"])
+        type = TR_PROXY_SOCKS4;
+    else
+    {
+        //safety
+        if (![typeString isEqualToString: @"HTTP"])
+        {
+            typeString = @"HTTP";
+            [fDefaults setObject: typeString forKey: @"ProxyType"];
+        }
+        type = TR_PROXY_HTTP;
+    }
+    
+    tr_sessionSetProxyType(fHandle, type);
+}
+
 - (void) setRPCEnabled: (id) sender
 {
     tr_sessionSetRPCEnabled(fHandle, [fDefaults boolForKey: @"RPC"]);