diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile
index b195b88..9ef5b01 100644
--- a/oonf-dlep-radio/Makefile
+++ b/oonf-dlep-radio/Makefile
@@ -1,14 +1,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=oonf-dlep-radio
-PKG_VERSION:=0.15.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git
-PKG_SOURCE_DATE:=2018-03-19
-PKG_SOURCE_VERSION:=bffb88b040659b237c4c91b6b42dbbb47431750e
-PKG_MIRROR_HASH:=c85bf1e38483979f44486b6ad90800535fc7039a162c536c239d897b7c68ef70
+PKG_SOURCE_DATE:=2022-08-25
+PKG_SOURCE_VERSION:=fb15d54d6a7a087cb0c5ec37c49804f6ce432396
+PKG_MIRROR_HASH:=61ff0080fe3766a93b82bade0404f33d3c6520ac4afc0303c5fb93298123974f
 
 PKG_MAINTAINER:=Henning Rogge <hrogge@gmail.com>
 
@@ -23,20 +22,26 @@ CMAKE_OPTIONS+=-D OONF_NO_WERROR:Bool=true \
                -D UCI:Bool=true \
                -D OONF_APP_DEFAULT_CFG_HANDLER:String=uci \
                -D OONF_STATIC_PLUGINS:String="class;clock;layer2;packet_socket;socket;stream_socket;telnet;timer;viewer;os_clock;os_fd;os_interface;os_system;nl80211_listener;layer2info;systeminfo;cfg_uciloader;cfg_compact;dlep_radio" \
-               -D OONF_LIB_GIT:String=v$(PKG_VERSION)-archive \
-               -D OONF_VERSION:String=$(PKG_VERSION) \
+               -D OONF_LIB_GIT:String=$(PKG_SOURCE_VERSION) \
+               -D VERSION_SUB_TAG:String=$(PKG_SOURCE_DATE) \
                -D INSTALL_LIB_DIR:Path=lib/oonf \
                -D INSTALL_INCLUDE_DIR:Path=include/oonf \
                -D INSTALL_CMAKE_DIR:Path=lib/oonf \
                -D CMAKE_PREFIX_PATH=$(STAGING_DIR)/usr
 
+define Package/oonf-git/template
+	SECTION:=net
+	CATEGORY:=Network
+	MAINTAINER:=Henning Rogge <hrogge@gmail.com>
+	SUBMENU:=OLSR.org network framework
+	URL:=http://www.olsr.org/
+endef
+
 define Package/oonf-dlep-radio
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=OLSR.org network framework
-  URL:=http://www.olsr.org/
-  TITLE:=Build DLEP Radio Agent
-  DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
+	$(call Package/oonf-git/template)
+	TITLE:=Build DLEP Radio Agent
+	DEPENDS:=+librt +libnl-tiny +libuci +oonf-init-scripts
+	VERSION:=$(PKG_VERSION)
 endef
 
 Build/Compile=$(call Build/Compile/Default,dlep_radio_static)
diff --git a/oonf-dlep-radio/patches/010-gcc10.patch b/oonf-dlep-radio/patches/010-gcc10.patch
deleted file mode 100644
index db3f69e..0000000
--- a/oonf-dlep-radio/patches/010-gcc10.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src-plugins/generic/dlep/radio/dlep_radio_internal.h
-+++ b/src-plugins/generic/dlep/radio/dlep_radio_internal.h
-@@ -49,6 +49,6 @@
- #include "core/oonf_logging.h"
- 
- /* headers only for use inside the DLEP_RADIO subsystem */
--enum oonf_log_source LOG_DLEP_RADIO;
-+extern enum oonf_log_source LOG_DLEP_RADIO;
- 
- #endif /* DLEP_RADIO_INTERNAL_H_ */
---- a/src-plugins/generic/nl80211_listener/nl80211_internal.h
-+++ b/src-plugins/generic/nl80211_listener/nl80211_internal.h
-@@ -49,6 +49,6 @@
- #include "core/oonf_logging.h"
- 
- /* headers only for use inside the NL80211 subsystem */
--enum oonf_log_source LOG_NL80211;
-+extern enum oonf_log_source LOG_NL80211;
- 
- #endif /* NL80211_INTERNAL_H_ */