diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile
index f0dc3170a..f566ec1e7 100644
--- a/libs/fcgi/Makefile
+++ b/libs/fcgi/Makefile
@@ -19,6 +19,7 @@ PKG_FIXUP:=libtool-ucxx
 
 PKG_INSTALL:=1
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/fcgi/Default
@@ -36,7 +37,7 @@ endef
 
 define Package/fcgixx
   $(call Package/fcgi/Default)
-  DEPENDS:=fcgi +uclibcxx
+  DEPENDS:=fcgi $(CXX_DEPENDS)
   TITLE:=Shared library of FastCGI++
 endef
 
@@ -46,7 +47,6 @@ define Package/fcgi/description
  server specific APIs.
 endef
 
-TARGET_CXX=g++-uc
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS += \