diff --git a/cad/pcb-rnd/Makefile b/cad/pcb-rnd/Makefile
index 136a86a00ba5..6b9eca09f1dc 100644
--- a/cad/pcb-rnd/Makefile
+++ b/cad/pcb-rnd/Makefile
@@ -1,30 +1,38 @@
 PORTNAME=	pcb-rnd
-DISTVERSION=	3.0.4
+DISTVERSION=	3.0.5
 CATEGORIES=	cad
 MASTER_SITES=	http://repo.hu/projects/pcb-rnd/releases/
 
 MAINTAINER=	fuz@fuz.su
 COMMENT=	Flexible, modular Printed Circuit Board editor
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libfungw.so:devel/fungw \
-		librnd-hid.so:cad/librnd \
 		libfreetype.so:print/freetype2 \
 		libgd.so:graphics/gd \
+		libgenht.so:devel/genht \
+		librnd-hid.so:cad/librnd \
 		libxml2.so:textproc/libxml2
 
 USES=		gmake pkgconfig tar:bz2
 
 HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--cflags/libs/sul/freetype2="-I${LOCALBASE}/include/freetype2 -I${LOCALBASE}/include/freetype2/freetype" \
+		--ldflags/libs/sul/freetype2=-L${LOCALBASE}/lib \
+		${WITH_DEBUG:D--debug} \
+		--CC=${CC} \
+		--CFLAGS='${CFLAGS}' \
+		--LDFLAGS='${LDFLAGS}'
 BINARY_ALIAS=	make=${MAKE_CMD}
 
 OPTIONS_DEFINE=	DOCS
 
-pre-configure:
-	${REINPLACE_CMD} \
-	    -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
-	    ${WRKSRC}/scconfig/src/sul/find_freetype2.c
+post-install:
+.for f in pcb-rnd txt2bxl bxl2txt gsch2pcb-rnd
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/$f
+.endfor
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/pcb-rnd/plugins/*.so
 
 .include <bsd.port.mk>
diff --git a/cad/pcb-rnd/distinfo b/cad/pcb-rnd/distinfo
index 9b3841f40444..152af812814f 100644
--- a/cad/pcb-rnd/distinfo
+++ b/cad/pcb-rnd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1651840727
-SHA256 (pcb-rnd-3.0.4.tar.bz2) = 77c1b5c5e8ea6ab10e3b5a336d2b46e7e58748e922fbeb1d74605743c6adfb81
-SIZE (pcb-rnd-3.0.4.tar.bz2) = 4528842
+TIMESTAMP = 1658370125
+SHA256 (pcb-rnd-3.0.5.tar.bz2) = 7051a6e9afd2eaf7dc02a6d89eb5c0ff7763ca0c9c9e41bf332e4a8247700cde
+SIZE (pcb-rnd-3.0.5.tar.bz2) = 4740783
diff --git a/cad/pcb-rnd/files/patch-scconfig_src_sul_find__freetype2.c b/cad/pcb-rnd/files/patch-scconfig_src_sul_find__freetype2.c
deleted file mode 100644
index 353415d85b5d..000000000000
--- a/cad/pcb-rnd/files/patch-scconfig_src_sul_find__freetype2.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- scconfig/src/sul/find_freetype2.c.orig	2022-05-27 13:11:01 UTC
-+++ scconfig/src/sul/find_freetype2.c
-@@ -57,7 +57,7 @@ int find_sul_freetype2(const char *name, int logdepth,
- 	if (try_icl(logdepth, node, test_c, NULL, NULL, "-lfreetype"))
- 		return 0;
- 
--	if (try_icl(logdepth, node, test_c, NULL, "-I/usr/include/freetype2 -I/usr/include/freetype2/freetype", "-lfreetype"))
-+	if (try_icl(logdepth, node, test_c, NULL, "-I%%LOCALBASE%%/include/freetype2 -I%%LOCALBASE%%/include/freetype2/freetype -L%%LOCALBASE%%/lib", "-lfreetype"))
- 		return 0;
- 
- 	if (try_icl(logdepth, node, test_c, NULL, "-I/usr/include/freetype2", "-lfreetype"))