diff --git a/include/langchooser.inc b/include/langchooser.inc
index a5f7c352f..18f430e55 100644
--- a/include/langchooser.inc
+++ b/include/langchooser.inc
@@ -54,6 +54,9 @@ function language_choose_code()
     // Specified for the request (GET/POST parameter)
     if (isset($_REQUEST['lang'])) {
         $explicitly_specified = language_add($_REQUEST['lang'], $languages);
+
+	    // Set the language in a cookie for a year and for all *.php.net servers
+	    setcookie("MYPHPNET", $_REQUEST['lang'], time() + 60*60*24*365, '/', '.php.net');
     }
 
     // Specified in a shortcut URL (eg. /en/echo or /pt_br/echo)