diff --git a/apache/acl_security.pl b/apache/acl_security.pl
index 3e82055ac..91f10d1fa 100755
--- a/apache/acl_security.pl
+++ b/apache/acl_security.pl
@@ -21,31 +21,26 @@ foreach $v (@virts) {
 	local @vn = &virt_acl_name($v);
 	local ($can) = grep { $vcan{$_} } @vn;
 	local $vn = $can || $vn[0];
-	printf "<option value=\"%s\" %s>%s\n",
+	printf "<option value=\"%s\" %s>%s</option>\n",
 		$vn, $can ? "selected" : "",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn,
-		"</option>";
+		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
 	delete($vcan{$can}) if ($can);
 	}
 foreach $vn (keys %vcan) {
 	next if ($vn eq "*");
-	printf "<option value=\"%s\" %s>%s\n",
+	printf "<option value=\"%s\" %s>%s</option>\n",
 		$vn, "selected",
-		$vn eq "__default__" ? $text{'acl_defserv'} : $vn,
-		"</option>";
+		$vn eq "__default__" ? $text{'acl_defserv'} : $vn;
 	}
 print "</select></td>\n";
 
 print "<td><b>$text{'acl_global'}</b></td> <td><select name=global>\n";
-printf "<option value=1 %s> $text{'yes'}\n",
-	$_[0]->{'global'} == 1 ? "selected" : "",
-	"</option>";
-printf "<option value=2 %s> $text{'acl_htaccess'}\n",
-	$_[0]->{'global'} == 2 ? "selected" : "",
-	"</option>";
-printf "<option value=0 %s> $text{'no'}</select></td> </tr>\n",
-	$_[0]->{'global'} == 0 ? "selected" : "",
-	"</option>";
+printf "<option value=1 %s>$text{'yes'}</option>\n",
+	$_[0]->{'global'} == 1 ? "selected" : "";
+printf "<option value=2 %s>$text{'acl_htaccess'}</option>\n",
+	$_[0]->{'global'} == 2 ? "selected" : "";
+printf "<option value=0 %s>$text{'no'}</option></select></td> </tr>\n",
+	$_[0]->{'global'} == 0 ? "selected" : "";
 
 print "<tr> <td><b>$text{'acl_create'}</b></td> <td>\n";
 printf "<input type=radio name=create value=1 %s> $text{'yes'}\n",
@@ -106,9 +101,8 @@ printf "<input type=radio name=types_def value=0 %s> $text{'acl_sel'}<br>\n",
 map { $types{$_}++ } split(/\s+/, $_[0]->{'types'});
 print "<select name=types size=5 multiple>\n";
 for($i=0; $text{"type_$i"}; $i++) {
-	printf "<option value=\"%d\" %s>%s\n",
-		$i, $types{$i} ? "selected" : "", $text{"type_$i"},
-		"</option>";
+	printf "<option value=\"%d\" %s>%s</option>\n",
+		$i, $types{$i} ? "selected" : "", $text{"type_$i"};
 	}
 print "</select></td> </tr>\n";
 
diff --git a/apache/apache-lib.pl b/apache/apache-lib.pl
index 49fc9be76..840b9e2b9 100755
--- a/apache/apache-lib.pl
+++ b/apache/apache-lib.pl
@@ -975,9 +975,8 @@ local($i, $rv);
 $rv = "<select name=\"$_[1]\">\n";
 for($i=3; $i<@_; $i++) {
 	$_[$i] =~ /^([^,]*),(.*)$/;
-	$rv .= sprintf "<option value=\"$2\" %s> $1\n",
-		lc($2) eq lc($_[0]) || !defined($_[0]) && lc($2) eq lc($_[2]) ? "selected" : "",
-		"</option>";
+	$rv .= sprintf "<option value=\"$2\" %s>$1</option>\n",
+		lc($2) eq lc($_[0]) || !defined($_[0]) && lc($2) eq lc($_[2]) ? "selected" : "";
 	}
 $rv .= "</select>\n";
 return $rv;
@@ -1004,13 +1003,11 @@ foreach $m (keys %httpd_modules) {
 if (&indexof($_[0], @hl) < 0) { push(@hl, $_[0]); }
 $rv = "<select name=$_[1]>\n";
 foreach $h (&unique(@hl)) {
-	$rv .= sprintf "<option value=\"$h\" %s>$h\n",
-		$h eq $_[0] ? "selected" : "",
-		"</option>";
+	$rv .= sprintf "<option value=\"$h\" %s>$h</option>\n",
+		$h eq $_[0] ? "selected" : "";
 	}
-$rv .= sprintf "<option value=\"None\" %s>&lt;$text{'core_none'}&gt;\n",
-	$_[0] eq "None" ? "selected" : "",
-	"</option>";
+$rv .= sprintf "<option value=\"None\" %s>&lt;$text{'core_none'}&gt;</option>\n",
+	$_[0] eq "None" ? "selected" : "";
 $rv .= "</select>\n";
 return $rv;
 }
diff --git a/apache/mod_cache.pl b/apache/mod_cache.pl
index fd527e684..2fc2ec115 100755
--- a/apache/mod_cache.pl
+++ b/apache/mod_cache.pl
@@ -25,19 +25,19 @@ local ($c, $i = 0);
 foreach $c (@{$_[0]}, @{$_[1]}, { }) {
 	$rv .= "<tr $cb>\n";
 	$rv .= "<td><select name=CacheEnable_e_$i>\n";
-	$rv .= sprintf "<option value=0 %s>&nbsp;\n",
+	$rv .= sprintf "<option value=0 %s>&nbsp;</option>\n",
 			$c ? "" : "selected";
-	$rv .= sprintf "<option value=1 %s>%s\n",
+	$rv .= sprintf "<option value=1 %s>%s</option>\n",
 			$c->{'name'} eq 'CacheEnable' ? 'selected' : '',
 			$text{'yes'};
-	$rv .= sprintf "<option value=2 %s>%s\n",
+	$rv .= sprintf "<option value=2 %s>%s</option>\n",
 			$c->{'name'} eq 'CacheDisable' ? 'selected' : '',
 			$text{'no'};
 	$rv .= "</select></td> <td><select name=CacheEnable_t_$i>\n";
-	$rv .= sprintf "<option value=disk %s> %s\n",
+	$rv .= sprintf "<option value=disk %s>%s</option>\n",
 			$c->{'words'}->[0] eq 'disk' ? 'selected' : '',
 			$text{'cache_disk'};
-	$rv .= sprintf "<option value=mem %s> %s\n",
+	$rv .= sprintf "<option value=mem %s>%s</option>\n",
 			$c->{'words'}->[0] eq 'mem' ? 'selected' : '',
 			$text{'cache_mem'};
 	$rv .= "</select></td>\n";