diff --git a/wiki.pl b/wiki.pl
index 386ca093..6ae06a01 100755
--- a/wiki.pl
+++ b/wiki.pl
@@ -2293,7 +2293,7 @@ sub Cookie {
   my ($changed, $visible, %params) = CookieData(); # params are URL encoded
   if ($changed) {
     my $cookie = join(UrlEncode($FS), %params); # no CTL in field values
-    my $result = $q->cookie(-name=>$CookieName, -value=>$cookie, -expires=>'+2y');
+    my $result = $q->cookie(-name=>$CookieName, -value=>$cookie, -expires=>'+2y', secure=>$ENV{'HTTPS'}, httponly=>$ENV{'HTTPS'});
     if ($visible) {
       $Message .= $q->p(T('Cookie: ') . $CookieName . ', '
 			. join(', ', map {$_ . '=' . $params{$_}} keys(%params)));