Index: macosx/Controller.mm
===================================================================
--- macosx/Controller.mm	(revision 1043)
+++ macosx/Controller.mm	(working copy)
@@ -94,18 +94,19 @@
         selector: @selector( updateUI: ) userInfo: NULL repeats: YES]
         forMode: NSEventTrackingRunLoopMode];
 
-    if( ( build = hb_check_update( fHandle, &version ) ) > -1 )
+    // Inform the user if updated version is available.
+    if (( build = hb_check_update(fHandle, &version) ) > -1)
     {
-        /* Update available - tell the user */
-	
-        NSBeginInformationalAlertSheet( _( @"Update is available" ),
-            _( @"Go get it!" ), _( @"Discard" ), NULL, fWindow, self,
-            @selector( updateAlertDone:returnCode:contextInfo: ),
-            NULL, NULL, [NSString stringWithFormat:
-            _( @"HandBrake %s (build %d) is now available for download." ),
-            version, build] );
-        return;
-
+        NSAlert *alert = [NSAlert alertWithMessageText:_(@"Update is available")
+                                         defaultButton:_(@"Go get it!")
+                                       alternateButton:_(@"Discard")
+                                           otherButton:nil
+                             informativeTextWithFormat:_(@"HandBrake %s (build %d) is now available for download."), version, build];
+        if ([alert runModal] == NSAlertDefaultReturn)
+        {
+            [self openHomepage:nil];
+            [NSApp terminate:self];
+        }
     }
 
     // Open debug output window now if it was visible when HB was closed
@@ -123,22 +124,6 @@
         withObject: NULL waitUntilDone: NO];
 }
 
-- (void) updateAlertDone: (NSWindow *) sheet
-    returnCode: (int) returnCode contextInfo: (void *) contextInfo
-{
-    if( returnCode == NSAlertAlternateReturn )
-    {
-        /* Show scan panel */
-        [self performSelectorOnMainThread: @selector(showScanPanel:)
-            withObject: NULL waitUntilDone: NO];
-        return;
-    }
-
-    /* Go to HandBrake homepage and exit */
-    [self openHomepage: NULL];
-    [NSApp terminate: self];
-}
-
 - (NSApplicationTerminateReply) applicationShouldTerminate: (NSApplication *) app
 {
     // Warn if encoding a movie
Index: macosx/Controller.h
===================================================================
--- macosx/Controller.h	(revision 1043)
+++ macosx/Controller.h	(working copy)
@@ -230,8 +230,6 @@
 - (IBAction) Rip: (id) sender;
 - (void)     overWriteAlertDone: (NSWindow *) sheet
     returnCode: (int) returnCode contextInfo: (void *) contextInfo;
-- (void)     updateAlertDone: (NSWindow *) sheet
-    returnCode: (int) returnCode contextInfo: (void *) contextInfo;
 - (void)     doRip;
 
 - (IBAction) Cancel: (id) sender;