diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 93cb1a4f..a4bbdeab 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -277,6 +277,8 @@
 		4CF7805D176E71170032EE71 /* MPServerDaemon.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF7805C176E71170032EE71 /* MPServerDaemon.m */; };
 		4CF7805F176E75110032EE71 /* ServerSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CF7805E176E75110032EE71 /* ServerSettings.xib */; };
 		4CF78064176E75AD0032EE71 /* MPServerSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */; };
+		4CFB18E418A17FA20097A34B /* MPUpdateSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */; };
+		4CFB18E618A180430097A34B /* UpdateSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4CFB18E518A180430097A34B /* UpdateSettings.xib */; };
 		4CFC53BF16E94729007396BE /* MPShadowBox.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC53BE16E94729007396BE /* MPShadowBox.m */; };
 		4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873A179DEDF3000DFC03 /* KPKMetaData.m */; };
 		4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFC873D179DF200000DFC03 /* KPKTimeInfo.m */; };
@@ -839,6 +841,9 @@
 		4CF7805E176E75110032EE71 /* ServerSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ServerSettings.xib; sourceTree = "<group>"; };
 		4CF78062176E75AD0032EE71 /* MPServerSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPServerSettingsController.h; sourceTree = "<group>"; };
 		4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPServerSettingsController.m; sourceTree = "<group>"; };
+		4CFB18E218A17FA20097A34B /* MPUpdateSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUpdateSettingsController.h; sourceTree = "<group>"; };
+		4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUpdateSettingsController.m; sourceTree = "<group>"; };
+		4CFB18E518A180430097A34B /* UpdateSettings.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = UpdateSettings.xib; sourceTree = "<group>"; };
 		4CFC53BD16E94729007396BE /* MPShadowBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPShadowBox.h; sourceTree = "<group>"; };
 		4CFC53BE16E94729007396BE /* MPShadowBox.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPShadowBox.m; sourceTree = "<group>"; };
 		4CFC8739179DEDF3000DFC03 /* KPKMetaData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKMetaData.h; sourceTree = "<group>"; };
@@ -1439,6 +1444,8 @@
 				4CF78063176E75AD0032EE71 /* MPServerSettingsController.m */,
 				4CD7223917A7CB0700F5A1E1 /* MPWorkflowSettingsController.h */,
 				4CD7223A17A7CB0700F5A1E1 /* MPWorkflowSettingsController.m */,
+				4CFB18E218A17FA20097A34B /* MPUpdateSettingsController.h */,
+				4CFB18E318A17FA20097A34B /* MPUpdateSettingsController.m */,
 				4C65FAE616D16DDB006E0577 /* MPPasswordInputController.h */,
 				4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */,
 				4C5A11FB1708DE8700223D8A /* MPPasswordCreatorViewController.h */,
@@ -1789,6 +1796,7 @@
 				4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */,
 				4CF7805E176E75110032EE71 /* ServerSettings.xib */,
 				4CD7223717A7C9EA00F5A1E1 /* WorkflowSettings.xib */,
+				4CFB18E518A180430097A34B /* UpdateSettings.xib */,
 			);
 			name = Settings;
 			sourceTree = "<group>";
@@ -1958,6 +1966,7 @@
 				4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */,
 				4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */,
 				4C2E381D16D11FF900037A9D /* 03_ServerTemplate.pdf in Resources */,
+				4CFB18E618A180430097A34B /* UpdateSettings.xib in Resources */,
 				4C2E381E16D11FF900037A9D /* 04_KlipperTemplate.pdf in Resources */,
 				4C2E381F16D11FF900037A9D /* 05_LanguagesTemplate.pdf in Resources */,
 				4CD78ABC16D155FF00768A1D /* 07_NotepadTemplate.pdf in Resources */,
@@ -2199,6 +2208,7 @@
 				4CD2B9061849424B0051B395 /* MPAutotypeContext.m in Sources */,
 				4C1842D3179C64F000E2F5BC /* KPKXmlTreeCryptor.m in Sources */,
 				4CFC873B179DEDF3000DFC03 /* KPKMetaData.m in Sources */,
+				4CFB18E418A17FA20097A34B /* MPUpdateSettingsController.m in Sources */,
 				4CFC873E179DF200000DFC03 /* KPKTimeInfo.m in Sources */,
 				4CCEDE2A179F203B008402BE /* MPOutlineView.m in Sources */,
 				4CCEDE2E179F213B008402BE /* MPNotifications.m in Sources */,
diff --git a/MacPass/MPSettingsWindowController.m b/MacPass/MPSettingsWindowController.m
index 58c38b68..b88f345e 100644
--- a/MacPass/MPSettingsWindowController.m
+++ b/MacPass/MPSettingsWindowController.m
@@ -10,6 +10,7 @@
 #import "MPGeneralSettingsController.h"
 #import "MPServerSettingsController.h"
 #import "MPWorkflowSettingsController.h"
+#import "MPUpdateSettingsController.h"
 
 @interface MPSettingsWindowController () {
   NSString *lastIdentifier;
@@ -111,14 +112,17 @@
   MPGeneralSettingsController *generalSettingsController = [[MPGeneralSettingsController alloc] init];
   MPServerSettingsController *serverSettingsController = [[MPServerSettingsController alloc] init];
   MPWorkflowSettingsController *workflowSettingsController = [[MPWorkflowSettingsController alloc] init];
+  MPUpdateSettingsController *updateSettingsController = [[MPUpdateSettingsController alloc] init];
   
   [self _addSettingsTab:generalSettingsController];
   [self _addSettingsTab:serverSettingsController];
   [self _addSettingsTab:workflowSettingsController];
+  [self _addSettingsTab:updateSettingsController];
 
   self.defaultToolbarItems = @[ [generalSettingsController identifier],
                                 [workflowSettingsController identifier],
-                                [serverSettingsController identifier] ];
+                                [serverSettingsController identifier],
+                                [updateSettingsController identifier]];
   
 
 }
diff --git a/MacPass/MPUpdateSettingsController.h b/MacPass/MPUpdateSettingsController.h
new file mode 100644
index 00000000..c6aba2e7
--- /dev/null
+++ b/MacPass/MPUpdateSettingsController.h
@@ -0,0 +1,14 @@
+//
+//  MPUpdateSettingsController.h
+//  MacPass
+//
+//  Created by Michael Starke on 04.02.14.
+//  Copyright (c) 2014 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPViewController.h"
+#import "MPSettingsTab.h"
+
+@interface MPUpdateSettingsController : MPViewController <MPSettingsTab>
+
+@end
diff --git a/MacPass/MPUpdateSettingsController.m b/MacPass/MPUpdateSettingsController.m
new file mode 100644
index 00000000..7b5d979b
--- /dev/null
+++ b/MacPass/MPUpdateSettingsController.m
@@ -0,0 +1,35 @@
+//
+//  MPUpdateSettingsController.m
+//  MacPass
+//
+//  Created by Michael Starke on 04.02.14.
+//  Copyright (c) 2014 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPUpdateSettingsController.h"
+
+@interface MPUpdateSettingsController ()
+
+@end
+
+@implementation MPUpdateSettingsController
+
+- (instancetype)init {
+  self = [super initWithNibName:@"UpdateSettings" bundle:nil];
+  return self;
+}
+
+- (NSString *)identifier {
+  return @"UpdateSettings";
+}
+
+- (NSImage *)image {
+  return [NSImage imageNamed:NSImageNameApplicationIcon];
+}
+
+- (NSString *)label {
+  return NSLocalizedString(@"UPDATE_SETTINGS", @"Update Settings Label");
+}
+
+
+@end
diff --git a/MacPass/MPWorkflowSettingsController.m b/MacPass/MPWorkflowSettingsController.m
index b806c30c..caa6e609 100644
--- a/MacPass/MPWorkflowSettingsController.m
+++ b/MacPass/MPWorkflowSettingsController.m
@@ -62,7 +62,7 @@ NSString *const kMPFirefoxBundleId = @"org.mozilla.firefox";
 }
 
 - (NSString *)label {
-  return NSLocalizedString(@"WORKFLOW", "");
+  return NSLocalizedString(@"WORKFLOW_SETTINGS", "");
 }
 
 #pragma mark Actions
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index 670e79e4..a03f4fc8 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -67,6 +67,8 @@
 	<string>NSApplication</string>
 	<key>NSSupportsAutomaticGraphicsSwitching</key>
 	<true/>
+	<key>SUFeedURL</key>
+	<string>https://raw.github.com/mstarke/MacPassUpdates/master/sparklecast.xml.rss</string>
 	<key>UTExportedTypeDeclarations</key>
 	<array>
 		<dict>
diff --git a/MacPass/UpdateSettings.xib b/MacPass/UpdateSettings.xib
new file mode 100644
index 00000000..057fa69b
--- /dev/null
+++ b/MacPass/UpdateSettings.xib
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="4514" systemVersion="13B42" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+    <dependencies>
+        <deployment defaultVersion="1080" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="4514"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="MPUpdateSettingsController">
+            <connections>
+                <outlet property="view" destination="1" id="0Ig-r5-x8L"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application"/>
+        <customView translatesAutoresizingMaskIntoConstraints="NO" id="1">
+            <rect key="frame" x="0.0" y="0.0" width="400" height="60"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <button translatesAutoresizingMaskIntoConstraints="NO" id="Z6x-oU-NC5">
+                    <rect key="frame" x="86" y="21" width="228" height="18"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <buttonCell key="cell" type="check" title="Automatically Check for Updates" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="RFg-q1-AwJ">
+                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <binding destination="Tm5-i7-V4P" name="value" keyPath="automaticallyChecksForUpdates" id="8wg-xJ-C1I"/>
+                    </connections>
+                </button>
+            </subviews>
+            <constraints>
+                <constraint firstAttribute="centerY" secondItem="Z6x-oU-NC5" secondAttribute="centerY" id="mvv-e0-Q0o"/>
+                <constraint firstAttribute="centerX" secondItem="Z6x-oU-NC5" secondAttribute="centerX" id="zST-bX-ffK"/>
+            </constraints>
+        </customView>
+        <customObject id="Tm5-i7-V4P" customClass="SUUpdater"/>
+    </objects>
+</document>
\ No newline at end of file
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b60f3588..76b1f7ef 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ