--- a/openssh-6.6.1_p1-r3.ebuild
+++ b/openssh-6.6.1_p1-r3.ebuild
@@ -153,6 +153,9 @@ src_prepare() {
 		printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
 	) > version.h
 
+	# Make sure hpn patch doesn't conflict with OpenSSH's 6.6.1 hotfix
+	use hpn && sed -i 's/^#define SSH_BUG_LARGEWINDOW\t0x10000000/#define SSH_BUG_LARGEWINDOW\t0x20000000/' compat.h || die
+
 	eautoreconf
 }