diff --git a/sys-devel/gettext/gettext-0.19.4.recipe b/sys-devel/gettext/gettext-0.19.6.recipe
similarity index 97%
rename from sys-devel/gettext/gettext-0.19.4.recipe
rename to sys-devel/gettext/gettext-0.19.6.recipe
index a4c55a3ae..a88d475e4 100644
--- a/sys-devel/gettext/gettext-0.19.4.recipe
+++ b/sys-devel/gettext/gettext-0.19.6.recipe
@@ -17,7 +17,7 @@ HOMEPAGE="http://www.gnu.org/software/gettext/"
 LICENSE="GNU GPL v3"
 COPYRIGHT="1998, 2010 Free Software Foundation, Inc."
 SOURCE_URI="http://ftp.gnu.org/pub/gnu/gettext/gettext-$portVersion.tar.gz"
-CHECKSUM_SHA256="8ac9f1ed1a5f8c4e656a2f37f5ba6b9ee04c4df79a575e876b0b6946aa417f3f"
+CHECKSUM_SHA256="ed4b4c19bd3a3034eb6769500a3592ff616759ef43cf30586dbb7a17c9dd695d"
 REVISION="1"
 ARCHITECTURES="x86_gcc2 x86 x86_64 arm"
 SECONDARY_ARCHITECTURES="x86_gcc2 x86"
@@ -97,6 +97,7 @@ INSTALL()
 	make install
 
 	rm $libDir/charset.alias
+	rm $libDir/libintl.la
 
 	prepareInstalledDevelLibs libasprintf libgettextpo libintl
 	prepareInstalledDevelLib libgettextlib '*.so' '*'
diff --git a/sys-devel/gettext/patches/gettext-0.19.4.patchset b/sys-devel/gettext/patches/gettext-0.19.6.patchset
similarity index 73%
rename from sys-devel/gettext/patches/gettext-0.19.4.patchset
rename to sys-devel/gettext/patches/gettext-0.19.6.patchset
index 83bcbf80b..435af0231 100644
--- a/sys-devel/gettext/patches/gettext-0.19.4.patchset
+++ b/sys-devel/gettext/patches/gettext-0.19.6.patchset
@@ -1,31 +1,11 @@
-From 11ca072fe823919abf4c5f5c8f26771cdcd705e2 Mon Sep 17 00:00:00 2001
+From aaf124ee5318e263da373001618e15b4b08f10f3 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 9 Sep 2014 20:00:54 +0000
 Subject: haiku patch
 
 
-diff --git a/gettext-runtime/intl/loadmsgcat.c b/gettext-runtime/intl/loadmsgcat.c
-index 570f476..114fa09 100644
---- a/gettext-runtime/intl/loadmsgcat.c
-+++ b/gettext-runtime/intl/loadmsgcat.c
-@@ -785,7 +785,6 @@ internal_function
- _nl_load_domain (struct loaded_l10nfile *domain_file,
- 		 struct binding *domainbinding)
- {
--  __libc_lock_define_initialized_recursive (static, lock);
-   int fd = -1;
-   size_t size;
- #ifdef _LIBC
-@@ -799,6 +798,7 @@ _nl_load_domain (struct loaded_l10nfile *domain_file,
-   int revision;
-   const char *nullentry;
-   size_t nullentrylen;
-+  __libc_lock_define_initialized_recursive (static, lock);
- 
-   __libc_lock_lock_recursive (lock);
-   if (domain_file->decided != 0)
 diff --git a/gettext-tools/src/x-lua.c b/gettext-tools/src/x-lua.c
-index 9fcc20d..b0720d4 100644
+index 5050838..28c3d91 100644
 --- a/gettext-tools/src/x-lua.c
 +++ b/gettext-tools/src/x-lua.c
 @@ -281,9 +281,9 @@ phase2_getc ()
@@ -75,17 +55,39 @@ index 9fcc20d..b0720d4 100644
            tp->type = token_type_rbracket;
            return;
 -- 
-1.8.3.4
+2.2.2
 
 
-From 9f8db4ffc826eb8cf08acc743ca279ddc11cb454 Mon Sep 17 00:00:00 2001
+From d900138b59e0c33cfa56adb747252f9bc3c67d4b Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Thu, 16 Oct 2014 08:51:57 +0200
 Subject: Fix C99ism in tests.
 
 
+diff --git a/gettext-tools/gnulib-lib/uniname/uniname.c b/gettext-tools/gnulib-lib/uniname/uniname.c
+index 8f9f1b4..7a77a85 100644
+--- a/gettext-tools/gnulib-lib/uniname/uniname.c
++++ b/gettext-tools/gnulib-lib/uniname/uniname.c
+@@ -375,6 +375,8 @@ unicode_name_character (const char *name)
+       if (false)
+       filled_buf:
+         {
++          uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
++          uint16_t *wordptr = words;
+           {
+             /* Special case for variation selector aliases. Keeps the
+                tables small.  */
+@@ -407,8 +409,6 @@ unicode_name_character (const char *name)
+               }
+           }
+           /* Convert the constituents to uint16_t words.  */
+-          uint16_t words[UNICODE_CHARNAME_MAX_WORDS];
+-          uint16_t *wordptr = words;
+           {
+             const char *p1 = buf;
+             for (;;)
 diff --git a/gettext-tools/gnulib-tests/test-quotearg-simple.c b/gettext-tools/gnulib-tests/test-quotearg-simple.c
-index 08aadc1..4657fbf 100644
+index b579af7..cf3cb23 100644
 --- a/gettext-tools/gnulib-tests/test-quotearg-simple.c
 +++ b/gettext-tools/gnulib-tests/test-quotearg-simple.c
 @@ -309,14 +309,16 @@ main (int argc _GL_UNUSED, char *argv[])
@@ -117,5 +119,5 @@ index 08aadc1..4657fbf 100644
          ASSERT (memcmp (buf, q, sizeof buf) == 0);
          free (q);
 -- 
-1.8.3.4
+2.2.2