diff --git a/hg/checkincoming.py b/hg/checkincoming.py
index 05bb704..522b505 100644
--- a/hg/checkincoming.py
+++ b/hg/checkincoming.py
@@ -24,8 +24,10 @@ def checkincoming( ui, repo, **kwargs ):
 	
 	if inc:
 		ui.status( 'Found %d incoming changesets.\n' % len(inc) );
-		resp = ui.prompt( 'Do you want to abort the commit and pull/update first? [y/N]', choices=('&yes', '&no'), default='n' );
-		return resp == 'y';
+		resp = ui.promptchoice( 'Do you want to abort the commit and pull/update first? [y/N]',
+			choices=('&yes', '&no'), default=1
+			);
+		return resp == 0;
 	else:
 		ui.status( 'Found no incoming changesets, proceeding to commit.\n' );
 		return False;
diff --git a/hg/commit-settings.py b/hg/commit-settings.py
new file mode 100644
index 0000000..5f17b19
--- /dev/null
+++ b/hg/commit-settings.py
@@ -0,0 +1,31 @@
+# -*- coding: utf-8 -*-
+
+"""
+ *  Copyright (C) 2009, Michael "Svedrin" Ziegler <diese-addy@funzt-halt.net>
+ *
+ *  Mumble-Django is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This package is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+"""
+
+import os, stat
+
+from mercurial import hg
+
+def checksettings( ui, repo, **kwargs ):
+	modified, added, removed, deleted, unknown, ignored, clean = repo.status();
+	
+	if "pyweb/settings.py" in modified + added + removed + deleted:
+		resp = ui.promptchoice( 'You are about to commit settings.py. Do you want to continue? [y/N]',
+			choices=('&yes', '&no'), default=1
+			);
+		return resp == 1;
+
+
+