diff --git a/macosx/English.lproj/PrefsWindow.nib/classes.nib b/macosx/English.lproj/PrefsWindow.nib/classes.nib
index 51fe28a0d..476f4e01b 100644
--- a/macosx/English.lproj/PrefsWindow.nib/classes.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/classes.nib
@@ -18,6 +18,7 @@
                 setBadge = id; 
                 setCheckForUpdate = id; 
                 setDownloadLocation = id; 
+                setEncryptionRequired = id; 
                 setGlobalLimit = id; 
                 setNat = id; 
                 setPort = id; 
diff --git a/macosx/English.lproj/PrefsWindow.nib/info.nib b/macosx/English.lproj/PrefsWindow.nib/info.nib
index 86cf2349f..a02deff48 100644
--- a/macosx/English.lproj/PrefsWindow.nib/info.nib
+++ b/macosx/English.lproj/PrefsWindow.nib/info.nib
@@ -23,7 +23,7 @@
 	</array>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>41</integer>
+		<integer>66</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>8R4031</string>
diff --git a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib
index ff905ce66..151273ce2 100644
Binary files a/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib and b/macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib differ
diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index 725987b70..733df16f4 100644
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -64,6 +64,8 @@
 - (NSArray *) sounds;
 - (void) setSound: (id) sender;
 
+- (void) setEncryptionRequired: (id) sender;
+
 - (void) setBadge: (id) sender;
 - (void) resetWarnings: (id) sender;
 - (void) setCheckForUpdate: (id) sender;
diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index b35f2e110..039eeef0c 100644
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -78,6 +78,9 @@
         //set NAT
         tr_natTraversalEnable(fHandle, [fDefaults boolForKey: @"NatTraversal"]);
         
+        //set encryption
+        //tr_setEncryptionMode(fHandle, [fDefaults boolForKey: @"EncryptionRequire"] ? TR_ENCRYPTION_REQUIRED : TR_ENCRYPTION_PREFERRED);
+        
         //actually set bandwidth limits
         [self applySpeedSettings: nil];
     }
@@ -336,6 +339,11 @@
         [sound play];
 }
 
+- (void) setEncryptionRequired: (id) sender
+{
+    //tr_setEncryptionMode(fHandle, [fDefaults boolForKey: @"EncryptionRequire"] ? TR_ENCRYPTION_REQUIRED : TR_ENCRYPTION_PREFERRED);
+}
+
 - (void) applySpeedSettings: (id) sender
 {
     if ([fDefaults boolForKey: @"SpeedLimit"])