diff --git a/audio/libshout/Makefile b/audio/libshout/Makefile
index e7fff83fe03e..65a738bd5ab2 100644
--- a/audio/libshout/Makefile
+++ b/audio/libshout/Makefile
@@ -33,10 +33,4 @@ SPEEX_LIB_DEPENDS=	libspeex.so:audio/speex
 THEORA_CONFIGURE_ENABLE=theora
 THEORA_LIB_DEPENDS=	libtheora.so:multimedia/libtheora
 
-post-patch:
-	@${REINPLACE_CMD} -e '/^DATA = / s| $$(ckport_DATA)||; /^install-data-am:/ s| install-ckportDATA||' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's| -ffast-math||g; /libssl/d' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/^AM_CPPFLAGS = / s|^\(.*\) \(@XIPH_CPPFLAGS@\) \(.*\)$$|\1 \3 \2|' ${WRKSRC}/examples/Makefile.in
-	@${REINPLACE_CMD} -e 's|#ifdef IPV6_V6ONLY|#if defined(__BSD_VISIBLE) \&\& defined(IPV6_V6ONLY)|' ${WRKSRC}/src/common/net/sock.c
-
 .include <bsd.port.mk>
diff --git a/audio/libshout/files/patch-Makefile.in b/audio/libshout/files/patch-Makefile.in
new file mode 100644
index 000000000000..9cf911a3bc46
--- /dev/null
+++ b/audio/libshout/files/patch-Makefile.in
@@ -0,0 +1,20 @@
+--- Makefile.in.orig	2020-05-08 18:29:05 UTC
++++ Makefile.in
+@@ -158,7 +158,7 @@ am__uninstall_files_from_dir = { \
+   }
+ am__installdirs = "$(DESTDIR)$(ckportdir)" "$(DESTDIR)$(docdir)" \
+ 	"$(DESTDIR)$(m4datadir)" "$(DESTDIR)$(pkgconfigdir)"
+-DATA = $(ckport_DATA) $(doc_DATA) $(m4data_DATA) $(pkgconfig_DATA)
++DATA = $(doc_DATA) $(m4data_DATA) $(pkgconfig_DATA)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ am__recursive_targets = \
+@@ -903,7 +903,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-ckportDATA install-docDATA install-m4dataDATA \
++install-data-am: install-docDATA install-m4dataDATA \
+ 	install-pkgconfigDATA
+ 
+ install-dvi: install-dvi-recursive
diff --git a/audio/libshout/files/patch-configure b/audio/libshout/files/patch-configure
new file mode 100644
index 000000000000..4e2c5e653f72
--- /dev/null
+++ b/audio/libshout/files/patch-configure
@@ -0,0 +1,19 @@
+--- configure.orig	2019-05-28 19:31:20 UTC
++++ configure
+@@ -11927,7 +11927,7 @@ if test -z "$GCC"; then
+ 		;;
+         esac
+ else
+-        XIPH_CFLAGS="-Wall -ffast-math -fsigned-char"
++        XIPH_CFLAGS="-Wall -fsigned-char"
+ 
+ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h
+ 
+@@ -14923,7 +14923,6 @@ EOF
+ done
+ XIPH_LIBS="$xt_filtered $XIPH_LIBS"
+ 
+-    SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl"
+     SHOUT_TLS="1"
+ 
+ else
diff --git a/audio/libshout/files/patch-examples-Makefile.in b/audio/libshout/files/patch-examples-Makefile.in
new file mode 100644
index 000000000000..d4a18ebb2e89
--- /dev/null
+++ b/audio/libshout/files/patch-examples-Makefile.in
@@ -0,0 +1,11 @@
+--- examples/Makefile.in.orig	2020-05-08 18:29:05 UTC
++++ examples/Makefile.in
+@@ -330,7 +330,7 @@ example_LDADD = $(top_builddir)/src/libshout.la @SHOUT
+ nonblocking_SOURCES = nonblocking.c
+ nonblocking_LDADD = $(top_builddir)/src/libshout.la @SHOUT_LIBDEPS@
+ AM_CFLAGS = @XIPH_CFLAGS@
+-AM_CPPFLAGS = @XIPH_CPPFLAGS@ -I$(top_builddir)/include
++AM_CPPFLAGS = -I$(top_builddir)/include @XIPH_CPPFLAGS@
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/audio/libshout/files/patch-src-common-net-sock.c b/audio/libshout/files/patch-src-common-net-sock.c
new file mode 100644
index 000000000000..90d647d48cdb
--- /dev/null
+++ b/audio/libshout/files/patch-src-common-net-sock.c
@@ -0,0 +1,11 @@
+--- src/common/net/sock.c.orig	2019-05-15 08:58:13 UTC
++++ src/common/net/sock.c
+@@ -742,7 +742,7 @@ sock_t sock_get_server_socket (int port, const char *s
+ 
+         setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const void *)&on, sizeof(on));
+         on = 0;
+-#ifdef IPV6_V6ONLY
++#if defined(__BSD_VISIBLE) && defined(IPV6_V6ONLY)
+         setsockopt (sock, IPPROTO_IPV6, IPV6_V6ONLY, &on, sizeof on);
+ #endif
+