diff --git a/bind8/bind8-lib.pl b/bind8/bind8-lib.pl
index 43d164572..d82b9f27b 100755
--- a/bind8/bind8-lib.pl
+++ b/bind8/bind8-lib.pl
@@ -1013,7 +1013,7 @@ elsif ($type eq "HINFO") {
 	}
 elsif ($type eq "TXT") {
 	print &ui_table_row($text{'value_TXT1'},
-	    &ui_textbox("value0", join("", @v), 80), 3);
+	    &ui_textarea("value0", join("", @v), 5, 80, "soft"), 3);
 	}
 elsif ($type eq "WKS") {
 	# Well known server
diff --git a/bind8/save_record.cgi b/bind8/save_record.cgi
index f44e8ae1d..eaaa2f8d3 100755
--- a/bind8/save_record.cgi
+++ b/bind8/save_record.cgi
@@ -218,6 +218,8 @@ else {
 		}
 	elsif ($in{'type'} eq "TXT") {
 		$fullvals = $in{'value0'};
+		$fullvals =~ s/\r//g;
+		$fullvals =~ s/\n/ /g;
 		$fullvals =~ s/((?:^|[^\\])(?:\\\\)*)[\"]/$1\\\"/g;
 		@splitvals = ( );
 		while($fullvals) {