diff --git a/sys-apps/sed/patches/sed-4.4.patchset b/sys-apps/sed/patches/sed-4.4.patchset
index 4fce13eb1..5fff04385 100644
--- a/sys-apps/sed/patches/sed-4.4.patchset
+++ b/sys-apps/sed/patches/sed-4.4.patchset
@@ -20,23 +20,3 @@ index 45bc796..3d757ca 100644
 -- 
 2.10.2
 
-
-From 4b02f1a4b378d25a1595cdbe9c7c3ab483cfa2aa Mon Sep 17 00:00:00 2001
-From: Oliver Tappe <zooey@hirschkaefer.de>
-Date: Thu, 8 Aug 2013 11:50:12 +0200
-Subject: Fix path to 'env' in help2man
-
-
-diff --git a/build-aux/help2man b/build-aux/help2man
-index ac3b293..590a5f2 100755
---- a/build-aux/help2man
-+++ b/build-aux/help2man
-@@ -1,4 +1,4 @@
--#!/usr/bin/env perl
-+#!/bin/env perl
- 
- # Generate a short man page from --help and --version output.
- # Copyright (C) 1997-2017 Free Software Foundation, Inc.
--- 
-2.10.2
-
diff --git a/sys-apps/sed/sed-4.4.recipe b/sys-apps/sed/sed-4.4.recipe
index 9678ae779..11093e8c8 100644
--- a/sys-apps/sed/sed-4.4.recipe
+++ b/sys-apps/sed/sed-4.4.recipe
@@ -5,42 +5,60 @@ While in some ways similar to an editor which permits scripted edits (such as \
 ed), sed works by making only one pass over the input(s), and is consequently \
 more efficient. But it is sed's ability to filter text in a pipeline which \
 particularly distinguishes it from other types of editors."
-HOMEPAGE="http://www.gnu.org/software/sed"
-COPYRIGHT="1989-2009 Free Software Foundation, Inc."
+HOMEPAGE="https://www.gnu.org/software/sed/"
+COPYRIGHT="1989-2017 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="2"
-SOURCE_URI="http://ftp.gnu.org/gnu/sed/sed-$portVersion.tar.xz"
+REVISION="3"
+SOURCE_URI="https://ftpmirror.gnu.org/sed/sed-$portVersion.tar.xz
+	https://ftp.gnu.org/gnu/sed/sed-$portVersion.tar.xz"
 CHECKSUM_SHA256="cbd6ebc5aaf080ed60d0162d7f6aeae58211a1ee9ba9bb25623daa6cd942683b"
 PATCHES="sed-$portVersion.patchset"
 
-ARCHITECTURES="?x86_gcc2 x86 x86_64 ?arm"
+ARCHITECTURES="!x86_gcc2 x86 x86_64 ?arm"
+SECONDARY_ARCHITECTURES="x86"
+
+commandSuffix=$secondaryArchSuffix
+commandBinDir=$binDir
+if [ "$targetArchitecture" = x86_gcc2 ]; then
+	commandSuffix=
+	commandBinDir=$prefix/bin
+fi
 
 PROVIDES="
-	sed = $portVersion compat >= 4
-	cmd:sed = $portVersion compat >= 4
+	sed$secondaryArchSuffix = $portVersion compat >= 4
+	cmd:sed$commandSuffix = $portVersion compat >= 4
 	"
 REQUIRES="
-	haiku
+	haiku$secondaryArchSuffix
 	"
+if [ -n "$secondaryArchSuffix" -a -z "$commandSuffix" ]; then
+CONFLICTS="
+	sed
+	"
+fi
 
 BUILD_REQUIRES="
-	haiku_devel
+	haiku${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
-	cmd:gcc
-	cmd:ld
-	cmd:make
 	cmd:awk
+	cmd:g++$secondaryArchSuffix
 	cmd:grep
+	cmd:ld$secondaryArchSuffix
+	cmd:make
 	"
 
-defineDebugInfoPackage sed \
-	$binDir/sed
+TEST_REQUIRES="
+	cmd:cmp
+	"
+
+defineDebugInfoPackage sed$secondaryArchSuffix \
+	"$commandBinDir"/sed
 
 
 BUILD()
 {
-	runConfigure ./configure \
+	runConfigure --omit-dirs binDir ./configure --bindir="$commandBinDir" \
 		--enable-regex-tests --without-included-regex \
 		--disable-rpath --with-gnu-ld
 	make $jobArgs
@@ -52,3 +70,8 @@ INSTALL()
 	rm $libDir/charset.alias
 	rmdir $libDir
 }
+
+TEST()
+{
+	make check
+}