diff --git a/ChangeLog b/ChangeLog
index d4db05b2..1c167dbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Dec  7 12:32:00 CET 2001 Daniel Veillard <daniel@veillard.com>
+
+	* uri.c: closed bug #66159
+	* testURI.c: added --escape option
+	* configure.in: some cleanup for xml2-config --cflags
+
 Thu Dec  6 15:31:30 CET 2001 Daniel Veillard <daniel@veillard.com>
 
 	* globals.c testThreads.c: removed some misplaced includes
diff --git a/configure.in b/configure.in
index b527e756..3f65c795 100644
--- a/configure.in
+++ b/configure.in
@@ -411,7 +411,7 @@ AC_ARG_WITH(iconv, [  --with-iconv[=DIR]      Add ICONV support (on)])
 if test "$with_iconv" = "no" ; then
     echo Disabling ICONV support
 else
-    if test "$with_iconv" != "yes" ; then
+    if test "$with_iconv" != "yes" -a "$with_iconv" != "" ; then
 	CPPFLAGS="${CPPFLAGS} -I$with_iconv/include"
 	# Export this since our headers include iconv.h
 	XML_INCLUDEDIR="${XML_INCLUDEDIR} -I$with_iconv/include"
diff --git a/testURI.c b/testURI.c
index 2233dc7f..60abae02 100644
--- a/testURI.c
+++ b/testURI.c
@@ -16,20 +16,62 @@
 #include <libxml/uri.h>
 #include <libxml/globals.h>
 
-int main(int argc, char **argv) {
-    int i, ret, arg = 1;
-    xmlURIPtr uri;
-    const char *base = NULL;
-    xmlChar *composite;
+static const char *base = NULL;
+static int escape = 0;
 
-    if ((argc > 1) && (argv[arg] != NULL) &&
+static void handleURI(const char *str) {
+    int ret;
+    xmlURIPtr uri;
+    xmlChar *res = NULL, *parsed = NULL;
+
+    uri = xmlCreateURI();
+
+    if (base == NULL) {
+	ret = xmlParseURIReference(uri, str);
+	if (ret != 0)
+	    printf("%s : error %d\n", str, ret);
+	else {
+	    xmlNormalizeURIPath(uri->path);
+	    if (escape != 0) {
+		parsed = xmlSaveUri(uri);
+		res = xmlURIEscape(parsed);
+		printf("%s\n", res);
+
+	    } else {
+		xmlPrintURI(stdout, uri);
+		printf("\n");
+	    }
+	}
+    } else {
+	res = xmlBuildURI((xmlChar *)str, (xmlChar *) base);
+	if (res != NULL) {
+	    printf("%s\n", res);
+	}
+	else
+	    printf("::ERROR::\n");
+    }
+    if (res != NULL)
+	xmlFree(res);
+    if (parsed != NULL)
+	xmlFree(parsed);
+    xmlFreeURI(uri);
+}
+
+int main(int argc, char **argv) {
+    int i, arg = 1;
+
+    if ((argc > arg) && (argv[arg] != NULL) &&
 	((!strcmp(argv[arg], "-base")) || (!strcmp(argv[arg], "--base")))) {
 	arg++;
 	base = argv[arg];
 	if (base != NULL)
 	    arg++;
     }
-    uri = xmlCreateURI();
+    if ((argc > arg) && (argv[arg] != NULL) &&
+	((!strcmp(argv[arg], "-escape")) || (!strcmp(argv[arg], "--escape")))) {
+	arg++;
+	escape++;
+    }
     if (argv[arg] == NULL) {
 	char str[1024];
 
@@ -50,47 +92,14 @@ int main(int argc, char **argv) {
 		i--;
 		str[i] = 0;
 	    }
-
-	    if (base == NULL) {
-		ret = xmlParseURIReference(uri, str);
-		if (ret != 0)
-		    printf("%s : error %d\n", str, ret);
-		else {
-		    xmlNormalizeURIPath(uri->path);
-		    xmlPrintURI(stdout, uri);
-		    printf("\n");
-		}
-	    } else {
-		composite = xmlBuildURI((xmlChar *)str, (xmlChar *) base);
-		if (composite != NULL) {
-		    printf("%s\n", composite);
-		    xmlFree(composite);
-		}
-		else
-		    printf("::ERROR::\n");
-	    }
+	    handleURI(str);
         }
     } else {
 	while (argv[arg] != NULL) {
-	    if (base == NULL) {
-		ret = xmlParseURIReference(uri, argv[arg]);
-		if (ret != 0)
-		    printf("%s : error %d\n", argv[arg], ret);
-		else {
-		    xmlPrintURI(stdout, uri);
-		    printf("\n");
-		}
-	    } else {
-		composite = xmlBuildURI((xmlChar *)argv[arg], (xmlChar *) base);
-		if (composite != NULL) {
-		    printf("%s\n", composite);
-		    xmlFree(composite);
-		}
-	    }
+	    handleURI(argv[arg]);
 	    arg++;
 	}
     }
-    xmlFreeURI(uri);
     xmlMemoryDump();
     return(0);
 }
diff --git a/uri.c b/uri.c
index ab547f5a..a20eec98 100644
--- a/uri.c
+++ b/uri.c
@@ -1030,7 +1030,6 @@ xmlURIEscape(const xmlChar * str)
         segment = xmlURIEscapeStr(BAD_CAST uri->opaque, BAD_CAST "");
         NULLCHK(segment)
         ret = xmlStrcat(ret, segment);
-        ret = xmlStrcat(ret, BAD_CAST ":");
         xmlFree(segment);
     }