diff --git a/srcpkgs/libreoffice/patches/0004-musl-execinfo_h.patch b/srcpkgs/libreoffice/patches/0004-musl-execinfo_h.patch
index 04d2b75063b..76a8e773b73 100644
--- a/srcpkgs/libreoffice/patches/0004-musl-execinfo_h.patch
+++ b/srcpkgs/libreoffice/patches/0004-musl-execinfo_h.patch
@@ -9,3 +9,25 @@
  #include <execinfo.h>
  #include <link.h>
  #define INCLUDE_BACKTRACE
+--- sal/osl/unx/backtrace.h	2017-07-25 22:26:39.000000000 +0200
++++ sal/osl/unx/backtrace.h	2017-08-04 17:53:35.182066906 +0200
+@@ -20,7 +20,7 @@
+ #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+ #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
+ 
+-#if defined (LINUX)
++#if defined (LINUX) && defined (__GLIBC__)
+ 
+ #include <execinfo.h>
+ 
+--- sal/osl/unx/backtrace.c	2017-07-25 22:26:39.000000000 +0200
++++ sal/osl/unx/backtrace.c	2017-08-04 17:54:56.831219663 +0200
+@@ -282,7 +282,7 @@
+     }
+ }
+ 
+-#elif !defined LINUX
++#elif !defined LINUX || !defined __GLIBC__
+ 
+ int backtrace( void **buffer, int max_frames )
+ {
diff --git a/srcpkgs/libreoffice/template b/srcpkgs/libreoffice/template
index 925b377abde..105d3ec9c79 100644
--- a/srcpkgs/libreoffice/template
+++ b/srcpkgs/libreoffice/template
@@ -1,7 +1,7 @@
 # Template file for 'libreoffice'
 pkgname=libreoffice
-version=5.3.4.2
-revision=2
+version=5.4.0.3
+revision=1
 build_style=gnu-configure
 configure_args="--disable-werror"
 nopie=yes
@@ -58,10 +58,10 @@ distfiles="
  ${_ooopurl}/${_ooop_templates_md5hash}-OOOP-templates-pack-${_ooop_templates_version}.zip
 "
 checksum="
- 1d75393fd8b02b1e2e2e001bc0262359c7452e29a0fff35cb152717246f02379
- 27436e2f9d755d9f909396b26f73e23fe3e297697c59ee802bdaadd9b8074665
- ab8600dc99e09d90fec83bcc505c42556156730f78973cecd74fa377fe8de91a
- 0f5acb29e93ab8a75a216e82c87192aabcf29fe8bada8e968cc7b255fcdf81af
+ 17b29d05349b0db15f606f2d630e84c0969c89af6bd06aad8d75a074ee2add94
+ 1333868b48d1e754887645eb0bdf246ab81abad8f182e1060ea20523d2774fa9
+ e1460aee386733725e0d734bb5fed4866c93b0342a49936eb45ec350e45e27d9
+ 579f79ba01e6e9046ce99895540cef6d8987e2445cedba4fb78d2969e593145e
  cf21b8a0a58c0f0af562869846ce2af4c68b13a7178b9b74ee7be7480a87c84c
  c95f6c398e81ee7def378e51e4c7b5bdeba526f28ff281e79ca3795e6d467159
  1834aa0632499134f98ce85057d6d67604b9ed3b7efa7f13e76046f5886a3a2d