diff --git a/macosx/Controller.m b/macosx/Controller.m
index 0d20f28af..df4d03a49 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -31,6 +31,7 @@
#import "CreatorWindowController.h"
#import "StatsWindowController.h"
#import "AboutWindowController.h"
+#import "QuittingWindowController.h"
#import "ButtonToolbarItem.h"
#import "NSApplicationAdditions.h"
#import "NSStringAdditions.h"
@@ -524,6 +525,8 @@ void sleepCallBack(void * controller, io_service_t y, natural_t messageType, voi
//clear badge
[fBadger clearBadge];
+ [[[QuittingWindowController alloc] init] showWindow: self];
+
//remaining calls the same as dealloc
[fInfoController release];
[fMessageController release];
diff --git a/macosx/QuittingWindow.xib b/macosx/QuittingWindow.xib
new file mode 100644
index 000000000..e05681f70
--- /dev/null
+++ b/macosx/QuittingWindow.xib
@@ -0,0 +1,509 @@
+
+
+
+ 1050
+ 9B18
+ 629
+ 949
+ 343.00
+
+
+
+
+
+ 0
+ ../../Transmission.xcodeproj
+ 3
+
+
+
diff --git a/macosx/QuittingWindowController.h b/macosx/QuittingWindowController.h
new file mode 100644
index 000000000..85084b7d9
--- /dev/null
+++ b/macosx/QuittingWindowController.h
@@ -0,0 +1,34 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2007 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import
+
+
+@interface QuittingWindowController : NSWindowController
+{
+ IBOutlet NSTextField * fMessageField;
+ IBOutlet NSProgressIndicator * fProgressBar;
+}
+
+@end
diff --git a/macosx/QuittingWindowController.m b/macosx/QuittingWindowController.m
new file mode 100644
index 000000000..79c6e8fda
--- /dev/null
+++ b/macosx/QuittingWindowController.m
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * $Id$
+ *
+ * Copyright (c) 2007 Transmission authors and contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *****************************************************************************/
+
+#import "QuittingWindowController.h"
+#import "NSStringAdditions.h"
+
+@implementation QuittingWindowController
+
+- (id) init
+{
+ return [super initWithWindowNibName: @"QuittingWindow"];
+}
+
+- (void) awakeFromNib
+{
+ [fMessageField setStringValue: [NSLocalizedString(@"Shutting Down", "Quitting Window -> message") stringByAppendingEllipsis]];
+ [fProgressBar startAnimation: nil];
+
+ [[self window] center];
+}
+
+@end