diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 89afb91e31..e87f8c8e81 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netatalk
-PKG_VERSION:=4.1.1
+PKG_VERSION:=4.2.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@SF/netatalk
-PKG_HASH:=2c8d312245b39a8b734ac9a8eb45110bc03de3088928e574310a990d3b800241
+PKG_HASH:=8f772804ce4322a4e8fb159528209450927e9df067daa5cc02ab59b35f4b450c
 
 PKG_MAINTAINER:=Antonio Pastor <antonio.pastor@gmail.com>
 PKG_LICENSE:=GPL-2.0-or-later
@@ -31,7 +31,7 @@ define Package/netatalk/Default
   TITLE:=Apple Filing Protocol
   PROVIDES:=netatalk
   URL:=http://netatalk.sourceforge.net
-  DEPENDS:=+libevent2 +libdb47 +libgcrypt
+  DEPENDS:=+libevent2 +libdb47 +libgcrypt +iniparser
 endef
 
 define Package/netatalk-small
@@ -97,7 +97,6 @@ MESON_ARGS += \
 	-Dwith-bdb-path="$(STAGING_DIR)/usr/" \
 	-Dwith-unicode-data-path="$(STAGING_DIR_HOST)/share/gnulib/tests/uniname/" \
 	-Dwith-libgcrypt-path="$(STAGING_DIR)/usr/" \
-	$(if $(CONFIG_SHADOW_PASSWORDS),-Dwith-shadow=true,-Dwith-shadow=false) \
 	-Dwith-afpstats=false \
 	-Dwith-cups=false \
 	-Dwith-quota=false \
@@ -108,8 +107,6 @@ MESON_ARGS += \
 	-Dwith-dtrace=false \
 	-Dwith-debug=false \
 	-Dwith-shell-check=false \
-	-Dwith-readmes=false \
-	-Dwith-manual=none \
 	-Dwith-init-style=none \
 
 ifeq ($(BUILD_VARIANT),small)
diff --git a/net/netatalk/files/afpd.init b/net/netatalk/files/afpd.init
index e139c1e61c..193856c892 100644
--- a/net/netatalk/files/afpd.init
+++ b/net/netatalk/files/afpd.init
@@ -24,19 +24,19 @@ valid_global=$valid_global'ad_domain|admin_auth_user|admin_group|force_user|forc
 valid_global=$valid_global'nt_domain|nt_separator|save_password|set_password|uam_list|uam_path|mac_charset|unix_charset|'
 valid_global=$valid_global'vol_charset|passwd_file|passwd_minlen|afp_interfaces|afp_listen|afp_port|appletalk|'
 valid_global=$valid_global'cnid_listen|cnid_server|ddp_address|ddp_zone|disconnect_time|dsireadbuf|hostname|'
-valid_global=$valid_global'max_connections|sleep_time|zeroconf|chmod_request|dircachesize|extmap_file|'
+valid_global=$valid_global'max_connections|sleep_time|chmod_request|dircachesize|extmap_file|'
 valid_global=$valid_global'force_xattr_with_sticky_bit|guest_account|ignored_attributes|legacy_icon|login_message|'
 valid_global=$valid_global'mimic_model|vol_dbpath|zeroconf_name|log_file|log_level|map_acls|ldap_auth_method|'
 valid_global=$valid_global'ldap_auth_dn|ldap_auth_pw|ldap_uri|ldap_userbase|ldap_userscope|ldap_groupbase|'
 valid_global=$valid_global'ldap_groupscope|ldap_uuid_attr|ldap_name_attr|ldap_group_attr|ldap_uuid_string|'
-valid_global=$valid_global'ldap_uuid_encoding|ldap_user_filter|ldap_group_filter|vol_dbnest|'
+valid_global=$valid_global'ldap_uuid_encoding|ldap_user_filter|ldap_group_filter|vol_dbnest|fce_ignore_names|'
 valid_homes='|basedir_regex|path|home_name|'
 valid_volume='|'
 valid_volume=$valid_volume'mac_charset|unix_charset|vol_charset|casefold|chmod_request|force_xattr_with_sticky_bit|'
-valid_volume=$valid_volume'ignored_attributes|login_message|vol_dbpath|path|appledouble|vol_size_limit|valid_users|'
+valid_volume=$valid_volume'ignored_attributes|login_message|vol_dbpath|path|server_name|vol_size_limit|valid_users|'
 valid_volume=$valid_volume'invalid_users|hosts_allow|hosts_deny|ea|password|file_perm|directory_perm|umask|preexec|'
 valid_volume=$valid_volume'postexec|root_preexec|root_postexec|rolist|rwlist|veto_files|acls|case_sensitive|prodos|'
-valid_volume=$valid_volume'read_only|time_machine|vol_dbnest|cnid_scheme|'
+valid_volume=$valid_volume'read_only|time_machine|vol_dbnest|cnid_scheme|volume_name|'
 valid_share='share_name'
 
 NL=$'\n'
diff --git a/net/netatalk/patches/010-iconv-build-fix.patch b/net/netatalk/patches/010-iconv-build-fix.patch
new file mode 100644
index 0000000000..bf56f2bcc4
--- /dev/null
+++ b/net/netatalk/patches/010-iconv-build-fix.patch
@@ -0,0 +1,43 @@
+--- a/bin/misc/meson.build
++++ b/bin/misc/meson.build
+@@ -1,10 +1,13 @@
++iconv_deps = []
++
+ if have_iconv
++    iconv_deps += iconv
+     executable(
+         'netacnv',
+         ['netacnv.c'],
+         include_directories: root_includes,
+         link_with: libatalk,
+-        dependencies: [iconv],
++        dependencies: [iconv_deps],
+         install: false,
+     )
+ endif
+@@ -14,6 +17,7 @@ executable(
+     ['logger_test.c'],
+     include_directories: root_includes,
+     link_with: libatalk,
++    dependencies: [iconv_deps],
+     install: false,
+ )
+ 
+@@ -22,7 +26,7 @@ executable(
+     ['fce.c'],
+     include_directories: root_includes,
+     link_with: libatalk,
+-    dependencies: [iniparser],
++    dependencies: [iniparser,iconv_deps],
+     install: true,
+ )
+ 
+@@ -38,7 +42,7 @@ if have_ldap
+         ['uuidtest.c'],
+         include_directories: root_includes,
+         link_with: libatalk,
+-        dependencies: [afpldaptest_deps],
++        dependencies: [afpldaptest_deps,iconv_deps],
+         c_args: confdir,
+         install: true,
+         build_rpath: rpath_libdir,