diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index c28fd52e3..d7e1ed2e6 100644
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -44,7 +44,7 @@ PKG_MD5SUM=$(PKG_MD5SUM_$(PKG_VERSION)$(PKG_EXTRAVERSION))
 ifeq ($(PKG_VERSION_SNAPSHOT),y)
   UCLIBC_SUBDIR:=uClibc-$(PKG_EXTRAVERSION)
 else
-  UCLIBC_SUBDIR:=uClibc-$(PKG_VERSION)$(PKG_EXTRAVERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl)
+  UCLIBC_SUBDIR:=uClibc-$(PKG_VERSION)$(if $(CONFIG_UCLIBC_VERSION_NPTL),+nptl,$(PKG_EXTRAVERSION))
 endif
 HOST_BUILD_DIR:=$(BUILD_DIR_TOOLCHAIN)/$(UCLIBC_SUBDIR)