diff --git a/Tools/faqwiz/faqwiz.py b/Tools/faqwiz/faqwiz.py
index 9282b36..14c4b30 100644
--- a/Tools/faqwiz/faqwiz.py
+++ b/Tools/faqwiz/faqwiz.py
@@ -87,8 +87,9 @@
 	list.append(escape(text[i:j]))
 	i = j
 	url = prog.group(0)
-	while url[-1] in ');:,.?\'"':
+	while url[-1] in '();:,.?\'"<>':
 	    url = url[:-1]
+	i = i + len(url)
 	url = escape(url)
 	if not pre or (pre and PROCESS_PREFORMAT):
 	    if ':' in url:
@@ -98,7 +99,6 @@
 	else:
 	    repl = url
 	list.append(repl)
-	i = i + len(url)
     j = len(text)
     list.append(escape(text[i:j]))
     return string.join(list, '')