diff --git a/CHANGES b/CHANGES
index 2d579e7182..8ec3e0e012 100755
--- a/CHANGES
+++ b/CHANGES
@@ -11,6 +11,10 @@ Asterisk 1.0.7
        but has now been fixed.
  -- chan_skinny
     -- A check has been added to avoid a crash.
+ -- chan_iax2
+    -- A feature has been added to CVS head to have the option of sending timestamps with
+       trunk frames.  It is not supported in 1.0, but a change has been made so that it
+       will at least not choke if sent trunk timestamps.
  -- app_voicemail
     -- Some checks have been added to avoid a crash.
  -- speex
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index f76a471ec8..a440e1429f 100755
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -5063,6 +5063,10 @@ static int socket_read(int *id, int fd, short events, void *cbdata)
 		/* This is a meta header */
 		switch(meta->metacmd) {
 		case IAX_META_TRUNK:
+		        if (meta->cmddata != 0) {
+				ast_log(LOG_WARNING, "meta trunk cmd %d received, I only understand 0 (perhaps the remote side is sending trunk timestamps?)\n", meta->cmddata);
+				return 1;
+		        }
 			if (res < sizeof(struct ast_iax2_meta_hdr) + sizeof(struct ast_iax2_meta_trunk_hdr)) {
 				ast_log(LOG_WARNING, "midget meta trunk packet received (%d of %d min)\n", res, (int)sizeof(struct ast_iax2_mini_hdr));
 				return 1;