diff --git a/IkiWiki/Wrapper.pm b/IkiWiki/Wrapper.pm
index 5eb96f4ae..84cc7540b 100644
--- a/IkiWiki/Wrapper.pm
+++ b/IkiWiki/Wrapper.pm
@@ -49,6 +49,7 @@ sub gen_wrapper () {
 	push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
 	               CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
 		       HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
+		       HTTP_HOST SERVER_PORT HTTPS
 		       REDIRECT_URL} if $config{cgi};
 	my $envsave="";
 	foreach my $var (@envsave) {
diff --git a/debian/changelog b/debian/changelog
index e9323014d..4ed9bb8b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ ikiwiki (3.20101232) UNRELEASED; urgency=low
     the site's main url.
   * Fix permalinks to recentchanges items and comments, broken by last
     release.
+  * Export three cgi env vars needed for CGI->url to work.
 
  -- Joey Hess <joeyh@debian.org>  Tue, 04 Jan 2011 16:00:55 -0400