diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index c7ab80fceb03..bed7bc05b9d1 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -1,46 +1,43 @@
 PORTNAME=	umurmur
 DISTVERSION=	0.2.20
 CATEGORIES=	audio net
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Minimalistic Murmur (Mumble server)
 WWW=		https://umurmur.net/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN_aarch64=		fails to compile: fatal error: byteswap.h file not found
-BROKEN_armv6=		fails to compile: fatal error: byteswap.h file not found
-
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libprotobuf-c.so:devel/protobuf-c
 
 USES=		autoreconf gmake libtool localbase
 USE_GITHUB=	yes
 USE_RC_SUBR=	umurmur
 
 GNU_CONFIGURE=	yes
 
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092
 LIB_DEPENDS+=	libmbedtls.so:security/mbedtls
 CONFIGURE_ARGS=	--with-ssl=mbedtls
 .else
 USES+=		ssl
 BROKEN_SSL=	openssl openssl31
 BROKEN_SSL_REASON=	Requires OpenSSL 3.0.0 deprecated CRYPTO_MEM_CHECK_ON
 CONFIGURE_ARGS=	--with-ssl=openssl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/configure.ac
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.c
 	@${REINPLACE_CMD} \
 		-e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/umurmur.conf.example
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/umurmur
 	${INSTALL_DATA} ${WRKSRC}/umurmur.conf.example ${STAGEDIR}${PREFIX}/etc/umurmur/umurmur.conf.sample
 
 .include <bsd.port.post.mk>
diff --git a/audio/umurmur/files/patch-configure.ac b/audio/umurmur/files/patch-configure.ac
index 14045b5e9d7b..6e9a84ad3b72 100644
--- a/audio/umurmur/files/patch-configure.ac
+++ b/audio/umurmur/files/patch-configure.ac
@@ -1,11 +1,11 @@
---- configure.ac.orig	2015-04-07 10:01:12 UTC
+--- configure.ac.orig	2021-03-21 20:49:04 UTC
 +++ configure.ac
-@@ -113,7 +113,7 @@ AS_IF([test "x$enable_shmapi" != xno],
- 
- 
+@@ -118,7 +118,7 @@ AS_IF([test "x$enable_shmapi" != xno],
+ 	AM_CONDITIONAL(USE_SHAREDMEMORY_API, false)
+ ])
  
 -AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config])
 +AC_DEFINE([DEFAULT_CONFIG], ["%%PREFIX%%/etc/umurmur.conf"], [Default config])
  
  # Checks for header files.
  AC_FUNC_ALLOCA
diff --git a/audio/umurmur/files/patch-src_conf.c b/audio/umurmur/files/patch-src_conf.c
index 209de220eae0..ab4b7b3df91e 100644
--- a/audio/umurmur/files/patch-src_conf.c
+++ b/audio/umurmur/files/patch-src_conf.c
@@ -1,30 +1,30 @@
---- src/conf.c.orig	2015-04-07 10:01:12 UTC
+--- src/conf.c.orig	2021-03-21 20:49:04 UTC
 +++ src/conf.c
-@@ -89,23 +89,23 @@ const char *getStrConf(param_t param)
+@@ -90,23 +90,23 @@ const char *getStrConf(param_t param)
  		case CERTIFICATE:
  			setting = config_lookup(&configuration, "certificate");
  			if (!setting)
 -				return "/etc/umurmur/certificate.crt";
 +				return "%%PREFIX%%/etc/umurmur/certificate.crt";
  			else {
  				if ((strsetting = config_setting_get_string(setting)) != NULL)
  					return strsetting;
  				else
 -					return "/etc/umurmur/certificate.crt";
 +					return "%%PREFIX%%/etc/umurmur/certificate.crt";
  			}
  			break;
  		case KEY:
  			setting = config_lookup(&configuration, "private_key");
  			if (!setting)
 -				return "/etc/umurmur/private_key.key";
 +				return "%%PREFIX%%/etc/umurmur/private_key.key";
  			else {
  				if ((strsetting = config_setting_get_string(setting)) != NULL)
  					return strsetting;
  				else
 -					return "/etc/umurmur/private_key.key";
 +					return "%%PREFIX%%/etc/umurmur/private_key.key";
  			}
  			break;
  		case CAPATH:
diff --git a/audio/umurmur/files/patch-src_byteorder.h b/audio/umurmur/patch-src_byteorder.h
similarity index 60%
rename from audio/umurmur/files/patch-src_byteorder.h
rename to audio/umurmur/patch-src_byteorder.h
index 05b7a4e5863a..134ce96050d4 100644
--- a/audio/umurmur/files/patch-src_byteorder.h
+++ b/audio/umurmur/patch-src_byteorder.h
@@ -1,16 +1,13 @@
---- src/byteorder.h.orig	2020-10-20 00:54:48 UTC
+--- src/byteorder.h.orig	2021-03-21 20:49:04 UTC
 +++ src/byteorder.h
-@@ -56,8 +56,12 @@ typedef uint64_t subblock;
+@@ -56,8 +56,10 @@ typedef uint64_t subblock;
  #elif defined( __x86_64__)
  #define SWAPPED(x) ({register uint64_t __out, __in = (x); __asm__("bswap %q0" : "=r"(__out) : "0"(__in)); __out;})
  #else
 +#if defined(__linux__)
  #include <byteswap.h>
--#define SWAPPED(x) bswap_64(x)
-+#elif defined(__FreeBSD__)
-+#include <sys/endian.h>
+ #define SWAPPED(x) bswap_64(x)
 +#endif // defined(__linux__)
-+#define SWAPPED(x) bswap64(x)
  #endif // defined(BYTE_ORDER_BIG_ENDIAN)
  #else
  #define BLOCKSIZE 4