diff --git a/Application/AppController.h b/Application/AppController.h
index 0a08caf03..3aeb33f7c 100644
--- a/Application/AppController.h
+++ b/Application/AppController.h
@@ -7,6 +7,7 @@
 @class PlaylistController;
 @class PlaylistView;
 @class PlaylistLoader;
+@class SUUpdater;
 
 @interface AppController : NSObject
 {
@@ -47,12 +48,16 @@
     IBOutlet NSWindowController *spotlightWindowController;
     
     IBOutlet FileTreeViewController *fileTreeViewController;
+    
+    IBOutlet SUUpdater *updater;
 
     NSOperationQueue *queue; // Since we are the app delegate, we take care of the op queue
     
     NSMutableSet* expandedNodes;
     
     BOOL miniMode;
+    
+    
 }
 
 @property (strong) IBOutlet NSButton *infoButton;
diff --git a/Application/AppController.m b/Application/AppController.m
index 9012ebd02..0cb149c03 100644
--- a/Application/AppController.m
+++ b/Application/AppController.m
@@ -22,6 +22,8 @@
 #import <MASShortcut/Shortcut.h>
 #import "Shortcuts.h"
 
+#import <Sparkle/Sparkle.h>
+
 void* kAppControllerContext = &kAppControllerContext;
 
 
@@ -139,6 +141,11 @@ void* kAppControllerContext = &kAppControllerContext;
 
 - (void)awakeFromNib
 {
+#ifdef DEBUG
+    // Prevent updates automatically in debug builds
+    [updater setAutomaticallyChecksForUpdates:NO];
+#endif
+    
 	[[totalTimeField cell] setBackgroundStyle:NSBackgroundStyleRaised];
 
     [self.infoButton setToolTip:NSLocalizedString(@"InfoButtonTooltip", @"")];
diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 4a16c6621..bbe67b485 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -1853,6 +1853,7 @@ Gw
                 <outlet property="shuffleButton" destination="1637" id="Nzr-Mw-z9P"/>
                 <outlet property="spotlightWindowController" destination="1675" id="1677"/>
                 <outlet property="totalTimeField" destination="778" id="1659"/>
+                <outlet property="updater" destination="1303" id="gDn-jb-V0R"/>
             </connections>
         </customObject>
         <menu title="Menu" autoenablesItems="NO" id="513" userLabel="DockMenu">