diff --git a/CHANGES b/CHANGES
index 9b1c1af45f..1b909940f9 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,12 +5,13 @@
 
 	X.org updated to 7.5.
 
-	Updated/fixed packages: busybox, dosfstools, e2fsprogs,
+	Updated/fixed packages: busybox, dosfstools, e2fsprogs, iperf,
 	libglib2, libpng, memstat, mtd-utils, pppd, setserial,
 	squashfs, wget
 
 	Issues resolved (http://bugs.uclibc.org):
 
+	#800: [PATCH] iperf update to 2.0.4
 	#1111: Bump wget to 1.12 and migrate to Makefile.autotools.in
 	#1129: Bump memstat to 0.8 and migrate to Makefile.package.in
 	#1273: BR2_INET_IPV6 does not enable IPv6 in pppd
diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk
index d18d7e5b36..10e5a37838 100644
--- a/package/iperf/iperf.mk
+++ b/package/iperf/iperf.mk
@@ -3,11 +3,21 @@
 # iperf
 #
 #############################################################
+IPERF_VERSION = 2.0.4
+IPERF_SOURCE = iperf-$(IPERF_VERSION).tar.gz
+IPERF_SITE = http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
 
-IPERF_VERSION:=2.0.3
-IPERF_SOURCE:=iperf-$(IPERF_VERSION).tar.gz
-IPERF_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/iperf
-IPERF_AUTORECONF:=NO
-IPERF_CONF_OPT:=--disable-dependency-tracking --disable-web100
+IPERF_AUTORECONF = NO
+FETCHMAIL_LIBTOOL_PATCH = NO
+
+IPERF_INSTALL_STAGING = NO
+IPERF_INSTALL_TARGET = YES
+
+IPERF_CONF_ENV = \
+	ac_cv_func_malloc_0_nonnull=yes
+
+IPERF_CONF_OPT = \
+	--disable-dependency-tracking \
+	--disable-web100
 
 $(eval $(call AUTOTARGETS,package,iperf))