diff --git a/macosx/Controller.h b/macosx/Controller.h
index 2bcb243ea..1ad14a7f2 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -40,7 +40,7 @@
 
 typedef enum
 {
-    ADD_NORMAL,
+    ADD_MANUAL,
     ADD_AUTO,
     ADD_SHOW_OPTIONS,
     ADD_URL,
diff --git a/macosx/Controller.m b/macosx/Controller.m
index 22d683a60..bb18fe395 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -693,7 +693,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 
 - (void) application: (NSApplication *) app openFiles: (NSArray *) filenames
 {
-    [self openFiles: filenames addType: ADD_NORMAL forcePath: nil];
+    [self openFiles: filenames addType: ADD_MANUAL forcePath: nil];
 }
 
 - (void) openFiles: (NSArray *) filenames addType: (addType) type forcePath: (NSString *) path
@@ -884,7 +884,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
 - (void) open: (NSArray *) files
 {
     NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: files, @"Filenames",
-                                [NSNumber numberWithInt: ADD_NORMAL], @"AddType", nil];
+                                [NSNumber numberWithInt: ADD_MANUAL], @"AddType", nil];
     [self performSelectorOnMainThread: @selector(openFilesWithDict:) withObject: dict waitUntilDone: NO];
 }
 
@@ -906,7 +906,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     if (code == NSOKButton)
     {
         NSDictionary * dictionary = [[NSDictionary alloc] initWithObjectsAndKeys: [panel filenames], @"Filenames",
-            [NSNumber numberWithInt: [useOptions boolValue] ? ADD_SHOW_OPTIONS : ADD_NORMAL], @"AddType", nil];
+            [NSNumber numberWithInt: [useOptions boolValue] ? ADD_SHOW_OPTIONS : ADD_MANUAL], @"AddType", nil];
         [self performSelectorOnMainThread: @selector(openFilesWithDict:) withObject: dictionary waitUntilDone: NO];
     }
 }
@@ -4151,7 +4151,7 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
     
     //get the torrent
-    if (torrentStruct != NULL && type != TR_RPC_TORRENT_ADDED)
+    if (torrentStruct != NULL && (type != TR_RPC_TORRENT_ADDED && type != TR_RPC_SESSION_CHANGED))
     {
         NSEnumerator * enumerator = [fTorrents objectEnumerator];
         Torrent * torrent;
@@ -4169,6 +4169,8 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     switch (type)
     {
         case TR_RPC_TORRENT_ADDED:
+            [self performSelectorOnMainThread: @selector(rpcAddTorrentStruct:) withObject:
+                [[NSValue valueWithPointer: torrentStruct] retain] waitUntilDone: NO];
             break;
         case TR_RPC_TORRENT_STARTED:
             break;
@@ -4185,6 +4187,26 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
     [pool release];
 }
 
+- (void) rpcAddTorrentStruct: (NSValue *) torrentStructPtr
+{
+    tr_torrent * torrentStruct = (tr_torrent *)[torrentStructPtr pointerValue];
+    [torrentStructPtr release];
+    
+    NSString * location = nil;
+    if (tr_torrentGetDownloadDir(torrentStruct) != NULL)
+        location = [NSString stringWithUTF8String: tr_torrentGetDownloadDir(torrentStruct)];
+    
+    Torrent * torrent = [[Torrent alloc] initWithTorrentStruct: torrentStruct location: location lib: fLib];
+    
+    [torrent setWaitToStart: [fDefaults boolForKey: @"AutoStartDownload"]];
+    
+    [torrent update];
+    [fTorrents addObject: torrent];
+    [torrent release];
+    
+    [self updateTorrentsInQueue];
+}
+
 /*- (void) ipcQuit
 {
     fRemoteQuit = YES;
diff --git a/macosx/Torrent.m b/macosx/Torrent.m
index 43f136acc..e116f3a03 100644
--- a/macosx/Torrent.m
+++ b/macosx/Torrent.m
@@ -1558,12 +1558,11 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
     if (torrentStruct)
     {
         fHandle = torrentStruct;
+        fInfo = tr_torrentInfo(fHandle);
         
-        const tr_info * info = tr_torrentInfo(fHandle);
-        NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: info->name]]
+        NSString * currentDownloadFolder = [self shouldUseIncompleteFolderForName: [NSString stringWithUTF8String: fInfo->name]]
                                                 ? fIncompleteFolder : fDownloadFolder;
         tr_torrentSetDownloadDir(fHandle, [currentDownloadFolder UTF8String]);
-        tr_metainfoFree(info);
     }
     else
     {
@@ -1607,12 +1606,12 @@ void completenessChangeCallback(tr_torrent * torrent, cp_status_t status, void *
             [self release];
             return nil;
         }
+        
+        fInfo = tr_torrentInfo(fHandle);
     }
     
     tr_torrentSetStatusCallback(fHandle, completenessChangeCallback, self);
     
-    fInfo = tr_torrentInfo(fHandle);
-    
     fNameString = [[NSString alloc] initWithUTF8String: fInfo->name];
     fHashString = [[NSString alloc] initWithUTF8String: fInfo->hashString];