diff --git a/net/3proxy/Makefile b/net/3proxy/Makefile
index 3309fa043db5..759568050ac5 100644
--- a/net/3proxy/Makefile
+++ b/net/3proxy/Makefile
@@ -1,54 +1,52 @@
 # Created by: tim@relay.nnn.tstu.ru
 
 PORTNAME=	3proxy
 DISTVERSION=	0.9.4
 CATEGORIES=	net
 
 MAINTAINER=	timp87@gmail.com
 COMMENT=	Proxy servers set (support HTTP(S), FTP, SOCKS, POP3, TCP & UDP)
 
 LICENSE=	APACHE20 BSD3CLAUSE GPLv2+ LGPL21+
 LICENSE_COMB=	dual
 
 USES=		cpe
 
-USE_RC_SUBR=	3proxy
 USE_GITHUB=	yes
-GH_ACCOUNT=	z3APA3A
+USE_RC_SUBR=	3proxy
 
 MAKEFILE=	Makefile.FreeBSD
 
 PLIST_SUB=	PORTNAME=${PORTNAME} \
 		3PROXY_LOGDIR=${3PROXY_LOGDIR}
 
 PORTDOCS=	README
 
 OPTIONS_DEFINE=	DOCS
 
 3PROXY_LOGDIR=	/var/log/${PORTNAME}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%CFLAGS%%|${CFLAGS}|' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e 's|%%3PROXY_LOGDIR%%|${3PROXY_LOGDIR}|' ${WRKSRC}/cfg/3proxy.cfg.sample
 	@${REINPLACE_CMD} -E -e 's| proxy( ?\(8\))| httppr\1|' ${WRKSRC}/man/*
 	@${REINPLACE_CMD} -E -e 's|([^P] "?)proxy|\1httppr|' ${WRKSRC}/man/proxy.8
 	@${REINPLACE_CMD} -E -e 's|#!/.+|#!${PREFIX}/bin/3proxy|' -e 's|/[^ ]+/3proxy\.cfg|${PREFIX}/etc/3proxy.cfg|' ${WRKSRC}/man/3proxy.8
 
 post-build:
 	${MV} ${WRKSRC}/bin/proxy ${WRKSRC}/bin/httppr
 	${MV} ${WRKSRC}/man/proxy.8 ${WRKSRC}/man/httppr.8
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${3PROXY_LOGDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
 	cd ${WRKSRC}/bin/ && ${INSTALL_PROGRAM} 3proxy ftppr mycrypt pop3p httppr smtpp socks tcppm udppm ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC}/cfg/ && ${INSTALL_DATA} 3proxy.cfg.sample ${STAGEDIR}${PREFIX}/etc/
 	cd ${WRKSRC}/bin/ && ${INSTALL_LIB} PCREPlugin.so StringsPlugin.so TrafficPlugin.so pamauth.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/
 	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.cfg.3 ${STAGEDIR}${PREFIX}/man/man3/
 	cd ${WRKSRC}/man/ && ${INSTALL_MAN} 3proxy.8 ftppr.8 pop3p.8 httppr.8 socks.8 tcppm.8 udppm.8 ${STAGEDIR}${PREFIX}/man/man8/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>
diff --git a/net/3proxy/distinfo b/net/3proxy/distinfo
index 541d63152f25..558357781644 100644
--- a/net/3proxy/distinfo
+++ b/net/3proxy/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1625251720
-SHA256 (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = b497f74d6cc7ee58ff824457427acc02c6f7a102e483816fbb1b2494942ef983
-SIZE (z3APA3A-3proxy-0.9.4_GH0.tar.gz) = 610340
+TIMESTAMP = 1625343847
+SHA256 (3proxy-3proxy-0.9.4_GH0.tar.gz) = b497f74d6cc7ee58ff824457427acc02c6f7a102e483816fbb1b2494942ef983
+SIZE (3proxy-3proxy-0.9.4_GH0.tar.gz) = 610340
diff --git a/net/3proxy/files/patch-Makefile.FreeBSD b/net/3proxy/files/patch-Makefile.FreeBSD
index 27c2a3b9a6ef..df90951823c1 100644
--- a/net/3proxy/files/patch-Makefile.FreeBSD
+++ b/net/3proxy/files/patch-Makefile.FreeBSD
@@ -1,15 +1,17 @@
 --- Makefile.FreeBSD.orig	2021-07-01 16:59:57 UTC
 +++ Makefile.FreeBSD
-@@ -10,10 +10,10 @@
+@@ -10,11 +10,11 @@
  BUILDDIR = ../bin/
  CC ?= gcc
  
 -CFLAGS = -c -O -fno-strict-aliasing -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
-+CFLAGS = -c %%CFLAGS%% -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL
++CFLAGS += -c -DNOODBC -DFD_SETSIZE=4096 -DWITH_POLL
  COUT = -o 
  LN ?= ${CC}
 -LDFLAGS = -pthread -O -fno-strict-aliasing 
-+LDFLAGS = -pthread
- # -lpthreads may be reuqired on some platforms instead of -pthreads
+-# -lpthreads may be reuqired on some platforms instead of -pthreads
++LDFLAGS += -pthread
++# -lpthreads may be required on some platforms instead of -pthreads
  # -ldl or -lld may be required for some platforms
  DCFLAGS = -fPIC
+ DLFLAGS = -shared