diff --git a/src/rc/access.c b/src/rc/access.c
index 59f0ef7..27a52dc 100644
--- a/src/rc/access.c
+++ b/src/rc/access.c
@@ -202,7 +202,7 @@ decode_member_header(RcArchive rca, RcMember mbr)
   memset(mbr, 0, sizeof(*mbr));
 
   while( html_fd_next_tag(rca->fd, tag, properties) )
-  { if ( strcasecmp(tag, "file") == 0 )
+  { if ( strmp(tag, "file") == 0 )
     { html_decode_tag(properties, make_file_tag_def(), mbr);
 
       if ( mbr->name )
@@ -279,7 +279,7 @@ find_archive_dimensions(RcArchive rca)
 { const char *data = rca->data;
   size_t alen = strlen(ARCHIVE_TAG);
 
-  if ( strncasecmp(data, ARCHIVE_TAG, alen) != 0 )
+  if ( strncmp(data, ARCHIVE_TAG, alen) != 0 )
   { const char *rc_end = &data[rca->size];
     const char *end = rc_end-1;
     const char *s;
@@ -298,7 +298,7 @@ find_archive_dimensions(RcArchive rca)
       { const char *start = end - len;
 	rc_size hdrlen = start - (const char *)rca->map_start;
 
-	if ( strncasecmp(start, ARCHIVE_TAG, alen) == 0 )
+	if ( strncmp(start, ARCHIVE_TAG, alen) == 0 )
 	{ rca->data  = (void *)start;
 	  rca->size -= hdrlen;
 
@@ -327,7 +327,7 @@ at_archive_start(RcArchive rca)
     return FALSE;
   }
 
-  if ( strncasecmp(buf, atag, alen) == 0 )
+  if ( strncmp(buf, atag, alen) == 0 )
     return TRUE;			/* fine, this is the start */
 
   rc_errno = RCE_NOERROR;
diff --git a/src/rc/build.c b/src/rc/build.c
index 6e148c3..670f1b3 100644
--- a/src/rc/build.c
+++ b/src/rc/build.c
@@ -3,9 +3,9 @@
     Part of SWI-Prolog
 
     Author:        Jan Wielemaker
-    E-mail:        jan@swi.psy.uva.nl
+    E-mail:        J.Wielemaker@science.uva.nl
     WWW:           http://www.swi-prolog.org
-    Copyright (C): 1985-2002, University of Amsterdam
+    Copyright (C): 1985-2008, University of Amsterdam
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -176,16 +176,16 @@ rc_save_data(RcMember m, FILE *fd)
 
 static int
 rc_save_member(RcMember m, FILE *fd)
-{ fprintf(fd, "\n<FILE NAME=\"%s\" CLASS=\"%s\" ENCODING=\"%s\" SIZE=%ld",
+{ fprintf(fd, "\n<file name=\"%s\" class=\"%s\" encoding=\"%s\" size=%ld",
 	  m->name, m->rc_class, m->encoding, (long)m->size);
   if ( m->modified )
-    fprintf(fd, " MODIFIED=%ld", (long)m->modified);
+    fprintf(fd, " modified=%ld", (long)m->modified);
   fprintf(fd, ">\n");
 
   if ( !rc_save_data(m, fd) )
     return FALSE;
 
-  fprintf(fd, "\n</FILE>\n");
+  fprintf(fd, "\n</file>\n");
 
   return TRUE;
 }
@@ -212,7 +212,7 @@ rc_save_archive(RcArchive rca, const char *to)
       hdrlen = hdr->size;
     }
 
-    fprintf(fd, "<ARCHIVE>\n");
+    fprintf(fd, "<archive>\n");
     for( member = rca->members; member; member = member->next )
     { if ( strcmp(member->name, "$header") == 0 &&
 	   strcmp(member->rc_class, "$rc") == 0 )
@@ -223,9 +223,9 @@ rc_save_archive(RcArchive rca, const char *to)
 	return FALSE;
       }
     }
-    fprintf(fd, "</ARCHIVE>\n");
+    fprintf(fd, "</archive>\n");
     size = ftell(fd) - hdrlen;
-    fprintf(fd, "<FOOT CONTENTLENGTH=%ld>\n", (long)size);
+    fprintf(fd, "<foot contentlength=%ld>\n", (long)size);
     if ( fclose(fd) == EOF )
     { rc_errno = RCE_ERRNO;
       return FALSE;
diff --git a/src/rc/html.c b/src/rc/html.c
index 29996a4..fb03f0f 100644
--- a/src/rc/html.c
+++ b/src/rc/html.c
@@ -34,11 +34,6 @@
 #include "html.h"
 #include <stdlib.h>
 
-#if !defined(strncasecmp) && !defined(HAVE_STRCASECMP) && defined(HAVE_STRICMP) 
-#define strcasecmp stricmp
-#define strncasecmp strnicmp
-#endif
-
 #ifndef EOS
 #define EOS '\0'
 #endif
@@ -76,7 +71,7 @@ html_find_tag(const char *data, const char *end, const char *tag)
     if ( data == end )
       return NULL;
 
-    if ( strncasecmp(data+1, tag, len) == 0 )
+    if ( strncmp(data+1, tag, len) == 0 )
     { int c = data[len+1];
 
       if ( isspace(c) || c == '>' )
@@ -95,7 +90,7 @@ html_find_close_tag(const char *data, const char *tag)
   while(data)
   { if ( (data = strchr(data, '<')) &&
 	 data[1] == '/' &&
-	 strncasecmp(data+2, tag, len) == 0 &&
+	 strncmp(data+2, tag, len) == 0 &&
 	 data[len+2] == '>' )
       return (char *)data+len+3;
     if ( data )
@@ -240,7 +235,7 @@ html_decode_tag(const char *data, HtmlTagDef spec, void *dest)
     }
 
     for(d=spec; d->tag; d++)
-    { if ( strncasecmp(si, d->tag, ei-si) == 0 )
+    { if ( strncmp(si, d->tag, ei-si) == 0 )
       { void *dst = (char *)dest + d->offset;
 
 	(*d->convert)(sv, ev-sv, dst, d->closure);