diff --git a/net/Makefile b/net/Makefile
index 5ffdd8aa0fa2..3fcfba05c468 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1290,7 +1290,6 @@
     SUBDIR += socketpipe
     SUBDIR += socketw
     SUBDIR += sofia-sip
-    SUBDIR += softethervpn
     SUBDIR += spideroak
     SUBDIR += splatd
     SUBDIR += spoofer
diff --git a/security/Makefile b/security/Makefile
index 984f8ef35d51..9f17f248856e 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1122,6 +1122,7 @@
     SUBDIR += snortsam
     SUBDIR += snortsnarf
     SUBDIR += softether
+    SUBDIR += softether-devel
     SUBDIR += softhsm
     SUBDIR += softhsm2
     SUBDIR += spass
diff --git a/net/softethervpn/Makefile b/security/softether-devel/Makefile
similarity index 91%
rename from net/softethervpn/Makefile
rename to security/softether-devel/Makefile
index 1c3ec4914e98..a020d59dbfd9 100644
--- a/net/softethervpn/Makefile
+++ b/security/softether-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
-PORTNAME=	softethervpn
+PORTNAME=	softether-devel
 PORTVERSION=	4.21.9613
-CATEGORIES=	net
+CATEGORIES=	security
 
 MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Cross-platform Multi-protocol VPN Software
@@ -10,6 +10,8 @@ COMMENT=	Cross-platform Multi-protocol VPN Software
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+CONFLICTS_INSTALL=	softether
+
 USES=		dos2unix gmake iconv localbase readline ssl
 DOS2UNIX_FILES=	src/Mayaqua/Network.c
 USE_GITHUB=	yes
diff --git a/net/softethervpn/distinfo b/security/softether-devel/distinfo
similarity index 100%
rename from net/softethervpn/distinfo
rename to security/softether-devel/distinfo
diff --git a/net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak b/security/softether-devel/files/patch-src-makefiles-freebsd_32bit.mak
similarity index 100%
rename from net/softethervpn/files/patch-src-makefiles-freebsd_32bit.mak
rename to security/softether-devel/files/patch-src-makefiles-freebsd_32bit.mak
diff --git a/net/softethervpn/files/patch-src_Mayaqua_Network.c b/security/softether-devel/files/patch-src_Mayaqua_Network.c
similarity index 100%
rename from net/softethervpn/files/patch-src_Mayaqua_Network.c
rename to security/softether-devel/files/patch-src_Mayaqua_Network.c
diff --git a/net/softethervpn/files/vpnbridge.in b/security/softether-devel/files/vpnbridge.in
similarity index 100%
rename from net/softethervpn/files/vpnbridge.in
rename to security/softether-devel/files/vpnbridge.in
diff --git a/net/softethervpn/files/vpnclient.in b/security/softether-devel/files/vpnclient.in
similarity index 100%
rename from net/softethervpn/files/vpnclient.in
rename to security/softether-devel/files/vpnclient.in
diff --git a/net/softethervpn/files/vpnserver.in b/security/softether-devel/files/vpnserver.in
similarity index 100%
rename from net/softethervpn/files/vpnserver.in
rename to security/softether-devel/files/vpnserver.in
diff --git a/net/softethervpn/pkg-descr b/security/softether-devel/pkg-descr
similarity index 100%
rename from net/softethervpn/pkg-descr
rename to security/softether-devel/pkg-descr
diff --git a/net/softethervpn/pkg-plist b/security/softether-devel/pkg-plist
similarity index 100%
rename from net/softethervpn/pkg-plist
rename to security/softether-devel/pkg-plist