diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index e13e8db87..da042f66e 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -8,10 +8,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=freeradius3
-PKG_VERSION:=release_3_0_21
-PKG_RELEASE:=5
+PKG_VERSION:=3_0_21
+PKG_RELEASE:=1
 
-PKG_SOURCE:=$(PKG_VERSION).tar.gz
+PKG_SOURCE:=release_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/FreeRADIUS/freeradius-server/archive
 PKG_HASH:=b2014372948a92f86cfe2cf43c58ef47921c03af05666eb9d6416bdc6eeaedc2
 
@@ -20,7 +20,7 @@ PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=COPYRIGHT LICENSE
 PKG_CPE_ID:=cpe:/a:freeradius:freeradius
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/freeradius-server-release_$(PKG_VERSION)
 PKG_FIXUP:=autoreconf
 
 PKG_CONFIG_DEPENDS := \
@@ -98,6 +98,11 @@ define Package/freeradius3-default
   TITLE:=Modules needed for Radius default configuration
 endef
 
+define Package/freeradius3-default/description
+ This meta-package contains only dependencies for modules needed in
+ FreeRADIUS default configuration.
+endef
+
 define Package/freeradius3-democerts
   $(call Package/freeradius3/Default)
   DEPENDS:=freeradius3
@@ -743,6 +748,10 @@ define Package/freeradius3/install
 	$(INSTALL_BIN) ./files/radiusd.init $(1)/etc/init.d/radiusd
 endef
 
+define Package/freeradius3-default/install
+	true
+endef
+
 define Package/freeradius3-democerts/install
 	$(INSTALL_DIR) $(1)/etc/freeradius3/certs
 	$(CP) \