diff --git a/g10/ChangeLog b/g10/ChangeLog
index 39e816cf7..68f96b0fd 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-21  David Shaw  <dshaw@grover.jabberwocky.com>
+
+	* keyserver.c (free_keyserver_spec): Fix small leak.
+	(keyserver_typemap): Map https if we are supporting it.
+
 2005-01-20  Werner Koch  <wk@g10code.com>
 
 	* cardglue.c (open_card): Issue new CARDCTRL(4) status.
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 735b7ebe1..d808bf5be 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -139,6 +139,8 @@ void
 free_keyserver_spec(struct keyserver_spec *keyserver)
 {
   m_free(keyserver->uri);
+  m_free(keyserver->scheme);
+  m_free(keyserver->auth);
   m_free(keyserver->host);
   m_free(keyserver->port);
   m_free(keyserver->path);
@@ -791,6 +793,10 @@ keyserver_typemap(const char *type)
 #ifdef HTTP_VIA_LIBCURL
   else if(strcmp(type,"http")==0)
     return "curl";
+#endif
+#ifdef HTTPS_VIA_LIBCURL
+  else if(strcmp(type,"https")==0)
+    return "curl";
 #endif
   else
     return type;