diff --git a/docs/develop/servers/registrar/Protocols b/docs/develop/servers/registrar/Protocols
index 7b6b89e807..d57039875c 100644
--- a/docs/develop/servers/registrar/Protocols
+++ b/docs/develop/servers/registrar/Protocols
@@ -73,6 +73,7 @@ on error:	- B_NO_REPLY (fatal)
 
 message fields:
 - "reboot": If true, the system reboots instead of turning the power off.
+- "confirm": If true, the user will be asked to confirm to shut down the system.
 
 -----------------------------------------------------------------------
 
diff --git a/headers/os/app/Roster.h b/headers/os/app/Roster.h
index b2d7b0c1d9..d92dc77e96 100644
--- a/headers/os/app/Roster.h
+++ b/headers/os/app/Roster.h
@@ -143,7 +143,7 @@ private:
 	class ArgVector;
 	friend class Private;
 
-	status_t ShutDown(bool reboot);
+	status_t ShutDown(bool reboot, bool confirm);
 
 	status_t AddApplication(const char *mimeSig, const entry_ref *ref,
 							uint32 flags, team_id team, thread_id thread,
diff --git a/headers/private/app/RosterPrivate.h b/headers/private/app/RosterPrivate.h
index bf7931abae..94525ac5ad 100644
--- a/headers/private/app/RosterPrivate.h
+++ b/headers/private/app/RosterPrivate.h
@@ -20,8 +20,8 @@ public:
 	status_t SendTo(BMessage *message, BMessage *reply, bool mime);
 	bool IsMessengerValid(bool mime) const;
 
-	status_t ShutDown(bool reboot)
-		{ return fRoster->ShutDown(reboot); }
+	status_t ShutDown(bool reboot, bool confirm)
+		{ return fRoster->ShutDown(reboot, confirm); }
 
 	// needed by BApplication
 
diff --git a/src/bin/shutdown.cpp b/src/bin/shutdown.cpp
index ee06bd9c34..431a8a2a43 100644
--- a/src/bin/shutdown.cpp
+++ b/src/bin/shutdown.cpp
@@ -13,6 +13,7 @@
 //  This program behaves identically as the BeOS R5 version, with these 
 //  added arguments:
 //  
+//  -a asks the user to confirm the shutdown
 //  -c cancels any running shutdown
 //
 //  Some code from Shard's Archiver from BeBits (was BSD/MIT too :).
@@ -81,6 +82,7 @@ usage(const char *arg0)
 	fprintf(stderr, "usage: %s [-rqca] [-d time]\n"
 		"\t-r reboot,\n"
 		"\t-q quick shutdown (don't broadcast apps),\n"
+		"\t-a ask user to confirm the shutdown (ignored when -q is given),\n"
 		"\t-c cancel a running shutdown,\n"
 		"\t-d delay shutdown by <time> seconds.\n", program);
 	exit(1);
@@ -90,6 +92,7 @@ usage(const char *arg0)
 int
 main(int argc, char **argv)
 {
+	bool askUser = false;
 	bool quick = false;
 
 	for (int32 i = 1; i < argc; i++) {
@@ -100,6 +103,9 @@ main(int argc, char **argv)
 
 			while (arg && isalpha((++arg)[0])) {
 				switch (arg[0]) {
+					case 'a':
+						askUser = true;
+						break;
 					case 'q':
 						quick = true;
 						break;
@@ -168,7 +174,7 @@ main(int argc, char **argv)
 	} else {
 		BRoster roster;
 		BRoster::Private rosterPrivate(roster);
-		status_t error = rosterPrivate.ShutDown(gReboot);
+		status_t error = rosterPrivate.ShutDown(gReboot, askUser);
 		fprintf(stderr, "Shutdown failed: %s\n", strerror(error));
 		return 2;
 	}
diff --git a/src/kits/app/Roster.cpp b/src/kits/app/Roster.cpp
index c5849b9bdf..86571fafdc 100644
--- a/src/kits/app/Roster.cpp
+++ b/src/kits/app/Roster.cpp
@@ -1273,6 +1273,8 @@ BRoster::AddToRecentFolders(const entry_ref *folder, const char *appSig) const
 
 	\param reboot If \c true, the system will be rebooted instead of being
 		   powered off.
+	\param confirm If \c true, the user will be asked to confirm to shut down
+		   the system.
 	\return
 	- \c B_SHUTTING_DOWN, when there's already a shutdown process in
 	  progress,
@@ -1280,7 +1282,7 @@ BRoster::AddToRecentFolders(const entry_ref *folder, const char *appSig) const
 	- another error code in case something went wrong.
 */
 status_t
-BRoster::ShutDown(bool reboot)
+BRoster::ShutDown(bool reboot, bool confirm)
 {
 	status_t error = B_OK;
 
@@ -1288,6 +1290,8 @@ BRoster::ShutDown(bool reboot)
 	BMessage request(B_REG_SHUT_DOWN);
 	if (error == B_OK)
 		error = request.AddBool("reboot", reboot);
+	if (error == B_OK)
+		error = request.AddBool("confirm", confirm);
 
 	// send the request
 	BMessage reply;