diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc b/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc
index 588802f76c..60349ef756 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/masthead-basic.inc
@@ -1,6 +1,6 @@
 <div class="yui-g"><div id="corner"><!-- TMPL_IF NAME="opacbookbag" --><a class="cart" href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="opaclanguagesdisplay" --><div id="language">
-	<ul><!-- TMPL_LOOP NAME="languages" --><li><a href="/cgi-bin/koha/changelanguage.pl?language=<!-- TMPL_VAR NAME="language" -->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
+	<ul><!-- TMPL_LOOP NAME="languages" --><li><a href="/cgi-bin/koha/opac-changelanguage.pl?language=<!-- TMPL_VAR NAME="language" -->"><!-- TMPL_VAR NAME="label" --></a> </li><!-- /TMPL_LOOP -->
 	</ul></div><!-- /TMPL_IF --></div></div>
 
 <div id="members">
diff --git a/opac/opac-changelanguage.pl b/opac/opac-changelanguage.pl
new file mode 100755
index 0000000000..9a470aef64
--- /dev/null
+++ b/opac/opac-changelanguage.pl
@@ -0,0 +1,26 @@
+#!/usr/bin/perl
+
+# This file is part of Koha.
+#
+# Koha 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.
+#
+# Koha 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.
+#
+# You should have received a copy of the GNU General Public License along with
+# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA  02111-1307 USA
+
+use C4::Output;
+use CGI;
+
+my $query    = new CGI;
+my $language = $query->param('language');
+my $url      = $query->referer();
+
+warn "Language : $query // $language // $url";
+setlanguagecookie( $query, $language, $url );
diff --git a/opac/opac-main.pl b/opac/opac-main.pl
index a7b5f24bb2..0c9087beec 100755
--- a/opac/opac-main.pl
+++ b/opac/opac-main.pl
@@ -50,7 +50,8 @@ foreach my $language (@$langavail) {
 #   next if $currently_selected_languages->{$language};
 #   FIXME: could incorporate language_name and language_locale_name for better display
     push @languages,
-      { language => $language->{'language_code'}, counter => $counter };
+      { language => $language->{'language_code'}, counter => $counter, selected=>($input->cookie('KohaOpacLanguage') ? $language->{'language_code'} eq $input->cookie('KohaOpacLanguage')
+  : $language->{'language_code'} eq C4::Context->preference('opaclanguages')) };
     $counter++;
 }