diff --git a/package/uhttpd/Config.in b/package/uhttpd/Config.in
index 8d5d8bee13..eeb169a96d 100644
--- a/package/uhttpd/Config.in
+++ b/package/uhttpd/Config.in
@@ -5,6 +5,7 @@ config BR2_PACKAGE_UHTTPD
 	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBUBOX
 	select BR2_PACKAGE_JSON_C
+	select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  uHTTPd is a tiny single threaded HTTP server with TLS, CGI
 	  and Lua support. It is intended as a drop-in replacement for
diff --git a/package/uhttpd/uhttpd.mk b/package/uhttpd/uhttpd.mk
index ba8e13ccb8..f4fcccfa67 100644
--- a/package/uhttpd/uhttpd.mk
+++ b/package/uhttpd/uhttpd.mk
@@ -11,6 +11,10 @@ UHTTPD_LICENSE = ISC
 UHTTPD_LICENSE_FILES = uhttpd.h
 UHTTPD_DEPENDENCIES = libubox json-c
 
+ifeq ($(BR2_PACKAGE_LIBXCRYPT),y)
+UHTTPD_DEPENDENCIES += libxcrypt
+endif
+
 ifeq ($(BR2_PACKAGE_LUA_5_1),y)
 UHTTPD_DEPENDENCIES += lua
 UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON