diff --git a/code/client/cl_main.c b/code/client/cl_main.c
index 68422814..9d896799 100644
--- a/code/client/cl_main.c
+++ b/code/client/cl_main.c
@@ -1053,7 +1053,7 @@ void CL_Connect_f( void ) {
 
 	if ( com_sv_running->integer && !strcmp( server, "localhost" ) ) {
 		// if running a local server, kill it
-		SV_Shutdown( "Server quit\n" );
+		SV_Shutdown( "Server quit" );
 	}
 
 	// make sure a local server is killed
diff --git a/code/qcommon/common.c b/code/qcommon/common.c
index a4641250..1c37c5e1 100644
--- a/code/qcommon/common.c
+++ b/code/qcommon/common.c
@@ -283,13 +283,13 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_DROP || code == ERR_DISCONNECT ) {
 		Com_Printf ("********************\nERROR: %s\n********************\n", com_errorMessage);
-		SV_Shutdown (va("Server crashed: %s\n",  com_errorMessage));
+		SV_Shutdown (va("Server crashed: %s",  com_errorMessage));
 		CL_Disconnect( qtrue );
 		CL_FlushMemory( );
 		com_errorEntered = qfalse;
 		longjmp (abortframe, -1);
 	} else if ( code == ERR_NEED_CD ) {
-		SV_Shutdown( "Server didn't have CD\n" );
+		SV_Shutdown( "Server didn't have CD" );
 		if ( com_cl_running && com_cl_running->integer ) {
 			CL_Disconnect( qtrue );
 			CL_FlushMemory( );
@@ -301,7 +301,7 @@ void QDECL Com_Error( int code, const char *fmt, ... ) {
 		longjmp (abortframe, -1);
 	} else {
 		CL_Shutdown ();
-		SV_Shutdown (va("Server fatal crashed: %s\n", com_errorMessage));
+		SV_Shutdown (va("Server fatal crashed: %s", com_errorMessage));
 	}
 
 	Com_Shutdown ();
@@ -321,7 +321,7 @@ do the apropriate things.
 void Com_Quit_f( void ) {
 	// don't try to shutdown if we are in a recursive error
 	if ( !com_errorEntered ) {
-		SV_Shutdown ("Server quit\n");
+		SV_Shutdown ("Server quit");
 		CL_Shutdown ();
 		Com_Shutdown ();
 		FS_Shutdown(qtrue);
diff --git a/code/server/sv_init.c b/code/server/sv_init.c
index 02bd9104..92dd6ad1 100644
--- a/code/server/sv_init.c
+++ b/code/server/sv_init.c
@@ -646,7 +646,7 @@ void SV_FinalMessage( char *message ) {
 			if (cl->state >= CS_CONNECTED) {
 				// don't send a disconnect to a local client
 				if ( cl->netchan.remoteAddress.type != NA_LOOPBACK ) {
-					SV_SendServerCommand( cl, "print \"%s\"", message );
+					SV_SendServerCommand( cl, "print \"%s\"\n", message );
 					SV_SendServerCommand( cl, "disconnect" );
 				}
 				// force a snapshot to be sent
diff --git a/code/server/sv_main.c b/code/server/sv_main.c
index e0d6f01a..84c2e52e 100644
--- a/code/server/sv_main.c
+++ b/code/server/sv_main.c
@@ -771,7 +771,7 @@ void SV_Frame( int msec ) {
 
 	// the menu kills the server with this cvar
 	if ( sv_killserver->integer ) {
-		SV_Shutdown ("Server was killed.\n");
+		SV_Shutdown ("Server was killed");
 		Cvar_Set( "sv_killserver", "0" );
 		return;
 	}