diff --git a/libs/tiff/Makefile b/libs/tiff/Makefile
index 9cb6a90a4..d5ed3b135 100644
--- a/libs/tiff/Makefile
+++ b/libs/tiff/Makefile
@@ -23,6 +23,7 @@ PKG_INSTALL:=1
 
 PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_libtiffxx
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/tiff/Default
@@ -43,7 +44,7 @@ $(call Package/tiff/Default)
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE+= library(c++ bindings)
-  DEPENDS:=+libtiff +uclibcxx
+  DEPENDS:=+libtiff $(CXX_DEPENDS)
 endef
 
 define Package/tiff-utils
@@ -56,9 +57,6 @@ endef
 
 TARGET_CFLAGS += $(FPIC)
 
-MAKE_FLAGS += \
-    CXX="g++-uc"
-
 define Build/Configure
 	$(call Build/Configure/Default, \
 		$(if $(CONFIG_PACKAGE_libtiffxx), \
@@ -78,8 +76,6 @@ define Build/Configure
 		--disable-jbig \
 		--without-x \
 		--with-apple-opengl-framework \
-		, \
-		CXX="g++-uc" \
 	)
 endef