diff --git a/refdoc/presentation/make_html.pike b/refdoc/presentation/make_html.pike
index ac4f563bb87fa307074f6477897f7cb0f27b5af0..1d9e08b4f7a0ab3f0c31ec8f21a5c06462af35fb 100644
--- a/refdoc/presentation/make_html.pike
+++ b/refdoc/presentation/make_html.pike
@@ -369,6 +369,9 @@ string parse_text(Node n, void|String.Buffer ret) {
       continue;
     }
 
+    if(c->get_node_type()==XML_COMMENT)
+      continue;
+
 #ifdef DEBUG
     if(c->get_node_type()!=XML_ELEMENT) {
       error( "Forbidden node type " + c->get_node_type() + " in doc node.\n" );
@@ -411,13 +414,13 @@ string parse_text(Node n, void|String.Buffer ret) {
 
     case "ref":
       if(resolve_reference) {
-	ret->add(resolve_reference(parse_text(c), c->get_attributes()));
+	ret->add(resolve_reference(parse_text(c), c->get_attributes()), " ");
 	break;
       }
       string ref;
       ref = c->get_attributes()->resolved;
       if(!ref) ref = parse_text(c);
-      ret->add("<font face='courier'>", ref, "</font>");
+      ret->add("<font face='courier'>", ref, "</font> ");
       break;
 
     case "dl":