diff --git a/CHANGES b/CHANGES
index ecd0134590..0d9684638f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+ 680.	[bug]		dns_rdata_fromstruct() mis-handles options bigger
+			than 255 octets.
+
  679.	[bug]		$INCLUDE could leak memory and file descriptors on
 			reload. [RT #639]
 
diff --git a/lib/dns/rdata/generic/opt_41.c b/lib/dns/rdata/generic/opt_41.c
index 1b8c3b45cd..78a1f8ce15 100644
--- a/lib/dns/rdata/generic/opt_41.c
+++ b/lib/dns/rdata/generic/opt_41.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: opt_41.c,v 1.20 2001/01/09 21:54:33 bwelling Exp $ */
+/* $Id: opt_41.c,v 1.21 2001/01/16 06:14:00 marka Exp $ */
 
 /* Reviewed: Thu Mar 16 14:06:44 PST 2000 by gson */
 
@@ -158,7 +158,7 @@ static inline isc_result_t
 fromstruct_opt(ARGS_FROMSTRUCT) {
 	dns_rdata_opt_t *opt = source;
 	isc_region_t region;
-	isc_uint8_t length;
+	isc_uint16_t length;
 
 	REQUIRE(type == 41);
 	REQUIRE(source != NULL);