--- a/includes/template.php	Sat Nov 29 22:49:41 2008 -0500
+++ b/includes/template.php	Tue Dec 02 21:11:22 2008 -0500
@@ -1744,8 +1744,9 @@
 (
   (?:https?|ftp|irc):\/\/                            # protocol
   (?:[^@\s\]"\':]+@)?                                # username (FTP only but whatever)
-  (?:(?:(?:[a-z0-9-]+\.)*)[a-z0-9-]+)                # hostname
-  (?:\/[A-z0-9_%\|~`!\!@#\$\^&?=\*\(\):;\.,\/-]*)? # path
+  (?:(?:(?:[a-z0-9-]+\.)*)[a-z0-9\[\]:]+)           # hostname
+  (?::[0-9]+)?                                       # port number
+  (?:\/[A-z0-9_%\|~`!\!@#\$\^&?=\*\(\):;\.,\/-]*)?   # path
 )
 EOF;