diff --git a/configure.ac b/configure.ac
index 90c067a..7053e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([sflowtool],[6.03])
+AC_INIT([sflowtool],[6.04])
 AC_CONFIG_SRCDIR([src/sflowtool.c])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
diff --git a/sflowtool.spec b/sflowtool.spec
index d4e848f..f8d7b0b 100644
--- a/sflowtool.spec
+++ b/sflowtool.spec
@@ -1,6 +1,6 @@
 Summary: tool to ascii-print or forward sFlow datagrams
 Name: sflowtool
-Version: 6.03
+Version: 6.04
 Release: 1%{?dist}
 License: https://www.inmon.com/technology/sflowlicense.txt
 Group: Productivity/Networking/Diagnostic
diff --git a/src/sflowtool.c b/src/sflowtool.c
index 1768953..8a65339 100644
--- a/src/sflowtool.c
+++ b/src/sflowtool.c
@@ -3935,6 +3935,10 @@ static void readFlowSampleElements(SFSample *sample)
       case SFLFLOW_EX_EGRESS_Q: readExtendedEgressQueue(sample); break;
       case SFLFLOW_EX_TRANSIT: readExtendedTransitDelay(sample); break;
       case SFLFLOW_EX_Q_DEPTH: readExtendedQueueDepth(sample); break;
+	/* In discard samples, any of the above may appear along with the following. */
+      case SFLFLOW_EX_FUNCTION: readExtendedFunction(sample); break;
+      case SFLFLOW_EX_HW_TRAP: readExtendedHardwareTrap(sample); break;
+      case SFLFLOW_EX_LINUX_REASON: readExtendedLinuxReason(sample); break;
       default: skipTLVRecord(sample, tag, length, "flow_sample_element"); break;
       }
       lengthCheck(sample, "flow_sample_element", start, length);