diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/Manifest b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/Manifest
index f378f80376..c1aff90f1c 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/Manifest
+++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/Manifest
@@ -1 +1 @@
-DIST netperf-2.7.0.tar.bz2 1024430 BLAKE2B 1263a2b3cee0790e4526245e522d29f8692a5a3e9d3b41468d1010bbee4d606a06904d9e0c4ac0af457bde562a476434be4c62a41e3c0dbf0e5c3aeb2ae5652a SHA512 5fb37945bead831247de9c8ba86b33f134ba39e753b483df72de97f536d0846538dadf61acc2dee57f04ab5d16a92afab4890e79a5d7ffa863afd526267fffad
+DIST netperf-2.7.0_pre20210121.tar.gz 1914186 BLAKE2B 14d3a769a049443d8bf62b58c93c2b9563a16b69bb151d35926aa8831167b8a31bdd7d820c80a0c0511a78e519742005bdfa2079d403a514e2ec17f41a1b8e7c SHA512 8d9908fe2cd778eae719265b67938ab44e18de960c845f976e80d6b419c08b11ae47d8b4b906c6ccaf280f9f66bcdcb0be2ab379b0dca8d62d86671d57057e20
diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch
deleted file mode 100644
index 00554cc0b5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.6.0-log-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/netserver.c
-+++ b/src/netserver.c
-@@ -165,7 +165,7 @@
- #elif defined(ANDROID)
- #define DEBUG_LOG_FILE_DIR "/data/local/tmp/"
- #else
--#define DEBUG_LOG_FILE_DIR "/tmp/"
-+#define DEBUG_LOG_FILE_DIR "/var/log/"
- #endif
- #endif /* DEBUG_LOG_FILE_DIR */
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-inline.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
deleted file mode 100644
index eb89d34f3e..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-inline.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright Seblu 2015
---- a/src/netlib.c
-+++ b/src/netlib.c
-@@ -3997,11 +3997,7 @@
-   }
- }
- 
--#ifdef WIN32
--__forceinline void demo_interval_display(double actual_interval)
--#else
--  inline void demo_interval_display(double actual_interval)
--#endif
-+void demo_interval_display(double actual_interval)
- {
-   static int count = 0;
-   struct timeval now;
-@@ -4060,15 +4056,7 @@
-    important compilers have supported such a construct so it should
-    not be a big deal. raj 2012-01-23 */
- 
--#ifdef WIN32
--/* It would seem that the Microsoft compiler will not inline across
--   source files. So there is little point in having an inline
--   directive in that situation.  Of course that makes me wonder if an
--   inline directive has to appear in netlib.h... */
- void demo_interval_tick(uint32_t units)
--#else
--  inline void demo_interval_tick(uint32_t units)
--#endif
- {
-   double actual_interval = 0.0;
- 
diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-space.patch b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-space.patch
deleted file mode 100644
index 9ad43270b1..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/files/netperf-2.7.0-space.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/netserver.c
-+++ b/src/netserver.c
-@@ -165,12 +165,12 @@
- #elif defined(ANDROID)
- #define DEBUG_LOG_FILE_DIR "/data/local/tmp/"
- #else
--#define DEBUG_LOG_FILE_DIR "/var/log/"
-+#define DEBUG_LOG_FILE_DIR "/var/log/netperf/"
- #endif
- #endif /* DEBUG_LOG_FILE_DIR */
- 
- #ifndef DEBUG_LOG_FILE
--#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR"netserver.debug"
-+#define DEBUG_LOG_FILE DEBUG_LOG_FILE_DIR "/netserver.debug"
- #endif
- 
- #if !defined(PATH_MAX)
diff --git a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0_pre20210121.ebuild
similarity index 82%
rename from sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0_pre20210121.ebuild
index c96a45cdd7..6c7229136b 100644
--- a/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0-r5.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/net-analyzer/netperf/netperf-2.7.0_pre20210121.ebuild
@@ -3,13 +3,15 @@
 
 EAPI=8
 
-inherit flag-o-matic
+inherit autotools flag-o-matic
 
 DESCRIPTION="Network performance benchmark"
-HOMEPAGE="http://www.netperf.org/"
-SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://github.com/HewlettPackard/netperf"
+EGIT_COMMIT="3bc455b23f901dae377ca0a558e1e32aa56b31c4"
+SRC_URI="https://github.com/HewlettPackard/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="netperf"
+
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="demo sctp"
@@ -25,13 +27,12 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-fix-scripts.patch
-	"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
 	"${FILESDIR}"/${PN}-2.7.0-includes.patch
-	"${FILESDIR}"/${PN}-2.7.0-space.patch
-	"${FILESDIR}"/${PN}-2.7.0-inline.patch
 	"${FILESDIR}"/${PN}-2.7.0-fcommon.patch
 )
 
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
 src_prepare() {
 	# Fixing paths in scripts
 	sed -i \
@@ -45,6 +46,11 @@ src_prepare() {
 		|| die
 
 	default
+	# from autogen.sh
+	eaclocal -I src/missing/m4
+	eautomake
+	eautoconf
+	eautoheader
 }
 
 src_configure() {