diff --git a/wp-login.php b/wp-login.php
index 54c0a3f77..7f89c2ba8 100644
--- a/wp-login.php
+++ b/wp-login.php
@@ -24,7 +24,12 @@ case 'logout':
 	wp_clearcookie();
 	do_action('wp_logout');
 	nocache_headers();
-	wp_redirect('wp-login.php');
+
+	$redirect_to = 'wp-login.php';
+	if ( isset($_REQUEST['redirect_to']) )
+		$redirect_to = preg_replace('|[^a-z0-9-~+_.?#=&;,/:]|i', '', $_REQUEST['redirect_to']);
+			
+	wp_redirect($redirect_to);
 	exit();
 
 break;