diff --git a/CHANGES b/CHANGES
index 7b824bed6c..1c177a8ad3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,7 @@
 
+ 491.	[bug]		nsupdate would segfault when sending certain
+			prerequisites with empty RDATA. [RT #357]
+
  490.	[func]		When a slave/stub zone has not yet successfully
 			obtained an SOA containing the zone's configured
 			retry time, perform the SOA query retries using
diff --git a/lib/dns/rdata.c b/lib/dns/rdata.c
index 577b2a8036..0e8112ec4a 100644
--- a/lib/dns/rdata.c
+++ b/lib/dns/rdata.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.108 2000/09/19 01:27:22 gson Exp $ */
+/* $Id: rdata.c,v 1.109 2000/09/26 19:37:06 gson Exp $ */
 
 #include <config.h>
 #include <ctype.h>
@@ -455,6 +455,12 @@ dns_rdata_towire(dns_rdata_t *rdata, dns_compress_t *cctx,
 
 	REQUIRE(rdata != NULL);
 
+	/*
+	 * Some DynDNS meta-RRs have empty rdata.
+	 */
+	if (rdata->length == 0)
+		return (ISC_R_SUCCESS);
+
 	st = *target;
 
 	TOWIRESWITCH