diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 850dd5b87cab..13044278f781 100644
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -1,36 +1,42 @@
 # Created by: mfechner@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	knxd
-PORTVERSION=	0.14.35
-PORTREVISION=	2
+PORTVERSION=	0.14.39
+PORTREVISION=	0
 CATEGORIES=	net
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	Advanced router/gateway for KNX
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libargp.so:devel/argp-standalone \
 		libev.so:devel/libev \
 		libfmt.so:devel/libfmt
 
 USES=		autoreconf compiler:c11 gmake libtool pkgconfig
 USE_RC_SUBR=	knxd
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip
 GH_ACCOUNT=	knxd
 GH_PROJECT=	knxd
-GH_TAGNAME=	7a3c5e065e5ab26eeb14257c8dff05fa94e9373e
+GH_TAGNAME=	746a8d85dfdc4c456a9b832eca358a062a2b351d
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?=--disable-systemd --disable-usb \
 		CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-I${LOCALBASE}/include -L/${LOCALBASE}/lib"
 
+post-patch:
+	# Replace script for version detection with PORTREVISION as the repository does not have a .git repo and therefor the script fails
+	@${REINPLACE_CMD} \
+		-e "s|^\(AC_INIT.*\)m4.*|\1\[${PORTVERSION}\])|" \
+			${WRKSRC}/configure.ac
+
 post-install:
 	(cd ${WRKSRC} && src/server/knxd_args -d -e 15.15.1 -E 15.15.2:8 -D -T -S -B single -b ipt:192.168.0.117 -u /var/run/knxd > ${STAGEDIR}${PREFIX}/etc/knxd.conf.sample)
 
 .include <bsd.port.mk>
diff --git a/net/knxd/distinfo b/net/knxd/distinfo
index 689a444f9449..6b38ec48c230 100644
--- a/net/knxd/distinfo
+++ b/net/knxd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1587072044
-SHA256 (knxd-knxd-0.14.35-7a3c5e065e5ab26eeb14257c8dff05fa94e9373e_GH0.tar.gz) = fe5626aa6dfd48cd2f047320a9962b22eab75b4a146210be54be1a3f8bfb35ea
-SIZE (knxd-knxd-0.14.35-7a3c5e065e5ab26eeb14257c8dff05fa94e9373e_GH0.tar.gz) = 320640
+TIMESTAMP = 1594672009
+SHA256 (knxd-knxd-0.14.39-746a8d85dfdc4c456a9b832eca358a062a2b351d_GH0.tar.gz) = 69d2283c7e50fe371873656c4f8a3dc314a14b1d36342d68cc79b58faf09c205
+SIZE (knxd-knxd-0.14.39-746a8d85dfdc4c456a9b832eca358a062a2b351d_GH0.tar.gz) = 288495
diff --git a/net/knxd/files/patch-src_libserver_cm__ip.cpp b/net/knxd/files/patch-src_libserver_cm__ip.cpp
deleted file mode 100644
index 576e06826fb1..000000000000
--- a/net/knxd/files/patch-src_libserver_cm__ip.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libserver/cm_ip.cpp.orig	2020-03-30 14:33:20 UTC
-+++ src/libserver/cm_ip.cpp
-@@ -21,6 +21,7 @@
- #include "config.h"
- 
- #include <net/if.h>
-+#include <netinet/in.h>
- #include <netdb.h>
- #include <sys/socket.h>
- #include <unistd.h>
diff --git a/net/knxd/files/patch-src_libserver_eibnetip.cpp b/net/knxd/files/patch-src_libserver_eibnetip.cpp
deleted file mode 100644
index 200369dd33f8..000000000000
--- a/net/knxd/files/patch-src_libserver_eibnetip.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/libserver/eibnetip.cpp.orig	2020-02-11 20:13:04 UTC
-+++ src/libserver/eibnetip.cpp
-@@ -192,7 +192,11 @@ EIBNetIPSocket::port ()
-     return -1;
-   if (sa.sin_family != AF_INET)
-     {
-+#ifdef ENODATA
-       errno = ENODATA;
-+#else
-+      errno = 9919;
-+#endif
-       return -1;
-     }
-   return sa.sin_port;