diff --git a/stunc/Makefile b/stunc/Makefile
index f81488d81..a84a2ba26 100755
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -1,7 +1,6 @@
 #
 # Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
-# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
@@ -9,28 +8,38 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.15
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=09f9868a79e1b5037a99a97fd4dee678869fe98a
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
+PKG_SOURCE_VERSION:=b8231dc570ecc914b52d9e3f8fc9c009280d1791
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
+MAKE_PATH:=src
+
 define Package/stunc/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbfdm-api
+endef
+
+define Package/stunc
+  $(Package/stunc/default)
+  TITLE += (default)
+  DEPENDS += +libopenssl
+  VARIANT:=default
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/stunc-mbedtls
@@ -38,29 +47,34 @@ define Package/stunc-mbedtls
   TITLE += (mbedtls)
   DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
   VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+  CONFLICTS := stunc stunc-openssl stunc-wolfssl
 endef
 
 define Package/stunc-openssl
   $(Package/stunc/default)
   TITLE += (openssl)
   DEPENDS += +PACKAGE_stunc-openssl:libopenssl
-  CONFLICTS := stunc-mbedtls
   VARIANT:=openssl
+  CONFLICTS := stunc stunc-mbedtls stunc-wolfssl
 endef
 
 define Package/stunc-wolfssl
   $(Package/stunc/default)
   TITLE += (wolfssl)
   DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
-  CONFLICTS := stunc-mbedtls stunc-openssl
   VARIANT:=wolfssl
+  CONFLICTS := stunc stunc-openssl stunc-mbedtls
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
+ifeq ($(BUILD_VARIANT),default)
+  MAKE_FLAGS += \
+	USE_OPENSSL="yes"
+endif
+
 ifeq ($(BUILD_VARIANT),wolfssl)
   MAKE_FLAGS += \
 	USE_WOLFSSL="yes"
@@ -87,16 +101,18 @@ define Package/stunc/default/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/stunc $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libstunc.so $(1)/usr/lib/bbfdm/libstunc.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/stunc $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/stunc $(1)/etc/init.d/stunc
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
+Package/stunc/install = $(Package/stunc/default/install)
 Package/stunc-openssl/install = $(Package/stunc/default/install)
 Package/stunc-wolfssl/install = $(Package/stunc/default/install)
 Package/stunc-mbedtls/install = $(Package/stunc/default/install)
 
+$(eval $(call BuildPackage,stunc))
 $(eval $(call BuildPackage,stunc-openssl))
 $(eval $(call BuildPackage,stunc-wolfssl))
 $(eval $(call BuildPackage,stunc-mbedtls))