diff --git a/gosher b/gosher
index 60c2eae..2a1acfa 100755
--- a/gosher
+++ b/gosher
@@ -165,7 +165,8 @@ serve_index(){
 		rline=$(echo "$line" | tr -d '\r')
 		case "$rline" in
 			'['*)
-				line=$(echo "$rline" | sed -r -e 's/\[//g;s/\]//g;s/\|/	/g;s/	/        /;')
+				line=$(echo "$rline" | sed -r -e 's/^\[//;s/\]$//;s/\|/	/g;s/	/        /;')
+				line=$(echo "$line" | sed -r -e "s/server	port/$HOSTNAME	$PORT/")
 			;;
 			t*)
 				line=$(echo "$rline" | cut -b 2-)