diff --git a/app-arch/sharutils/patches/sharutils-4.14.patchset b/app-arch/sharutils/patches/sharutils-4.14.patchset
index 46e9f7500..7a2ab8b03 100644
--- a/app-arch/sharutils/patches/sharutils-4.14.patchset
+++ b/app-arch/sharutils/patches/sharutils-4.14.patchset
@@ -1,4 +1,4 @@
-From 72e4b6e9859ea8e7c3f4a55947a20141bdd4a254 Mon Sep 17 00:00:00 2001
+From ddc3088b56acff9a92dd611bc35989cbea8ba580 Mon Sep 17 00:00:00 2001
 From: Chris Roberts <cpr420@gmail.com>
 Date: Sun, 24 Nov 2013 19:58:36 -0700
 Subject: Include config.h before other headers
@@ -17,3 +17,39 @@ index 57fa9d0..26e820b 100644
 -- 
 1.8.3.4
 
+
+From a9cb54731100e3d642a38721d655340d7ba47778 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Mon, 14 Apr 2014 18:36:36 +0000
+Subject: gcc2 fix
+
+
+diff --git a/configure b/configure
+index 98d81a5..b7af1ec 100755
+--- a/configure
++++ b/configure
+@@ -17612,6 +17612,8 @@ if ac_fn_c_try_compile "$LINENO"; then :
+ else
+   ac_cv_header_stdbool_h=no
+ fi
++ac_cv_header_stdbool_h=yes
++
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
+diff --git a/src/uuencode.c b/src/uuencode.c
+index 370726e..bbf259d 100644
+--- a/src/uuencode.c
++++ b/src/uuencode.c
+@@ -249,7 +249,7 @@ process_opts (int argc, char ** argv, int * mode)
+   if (HAVE_OPT(ENCODE_FILE_NAME))
+     {
+       size_t nmlen = strlen (output_name);
+-      size_t bfsz  = nmlen + (nmlen / 3) + 4;;
++      size_t bfsz  = nmlen + (nmlen / 3) + 4;
+       char * p = malloc (bfsz);
+       if (p == NULL)
+         fserr (UUENCODE_EXIT_FAILURE, "malloc", _("file name"));
+-- 
+1.8.3.4
+
diff --git a/app-arch/sharutils/sharutils-4.14.recipe b/app-arch/sharutils/sharutils-4.14.recipe
index 5dd3acc58..6bc6eb76c 100644
--- a/app-arch/sharutils/sharutils-4.14.recipe
+++ b/app-arch/sharutils/sharutils-4.14.recipe
@@ -15,20 +15,14 @@ shell. unshar may also process files containing concatenated shell archives.
 HOMEPAGE="http://www.gnu.org/software/sharutils/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1990-2013 Free Software Foundation, Inc."
-SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.xz"
-CHECKSUM_MD5="77ede22951bdb67279c6e78e79a04784"
+SRC_URI="http://ftp.gnu.org/gnu/sharutils/sharutils-4.14.tar.gz"
+CHECKSUM_SIZE="2113043"
+CHECKSUM_RMD160="18199af4630ffb16ed9d87573cb89f1cc49a6c57"
+CHECKSUM_SHA512="248dbdb5bdee69a729d866044a7d0e33c683ed8ad3d356fb6f62d9838d742e4be13f7b41bc45a1c97d905e164057f1261dba9b97b201946dbb19f191a7c78ef4"
 REVISION="1"
 
-ARCHITECTURES="x86 ?x86_64"
-
-if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
-	# x86_gcc2 is fine as primary target architecture as long as we're building
-	# for a different secondary architecture.
-	ARCHITECTURES="$ARCHITECTURES x86_gcc2"
-else
-	ARCHITECTURES="$ARCHITECTURES !x86_gcc2"
-fi
-SECONDARY_ARCHITECTURES="x86"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	sharutils$secondaryArchSuffix = $portVersion
@@ -47,6 +41,7 @@ BUILD_REQUIRES="
 	"
 
 BUILD_PREREQUIRES="
+	cmd:awk
 	cmd:make
 	cmd:which
 	cmd:bison