diff --git a/Makefile b/Makefile
index 26d180cc5422c968f5bde4ae4a300347b3f33e02..a23846b7c05136401ce2fb9d4ba09ca3111b7a4e 100644
--- a/Makefile
+++ b/Makefile
@@ -698,7 +698,9 @@ ifeq ($(uname_S),SunOS)
 	NO_MEMMEM = YesPlease
 	NO_HSTRERROR = YesPlease
 	NO_MKDTEMP = YesPlease
-	OLD_ICONV = UnfortunatelyYes
+	ifneq ($(uname_R),5.11)
+		OLD_ICONV = UnfortunatelyYes
+	endif
 	ifeq ($(uname_R),5.8)
 		NO_UNSETENV = YesPlease
 		NO_SETENV = YesPlease