diff -Naurp git-2.3.5.orig/config.mak.uname git-2.3.5/config.mak.uname
--- git-2.3.5.orig/config.mak.uname	2015-03-31 18:14:52.000000000 -0400
+++ git-2.3.5/config.mak.uname	2015-04-11 22:30:52.000000000 -0400
@@ -184,7 +184,9 @@ ifeq ($(uname_O),Cygwin)
 	SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
 endif
 ifeq ($(uname_S),FreeBSD)
-	NEEDS_LIBICONV = YesPlease
+	ifeq ($(shell expr "$(uname_R)" : '[1-9]\.'),2)
+		NEEDS_LIBICONV = YesPlease
+	endif
 	OLD_ICONV = YesPlease
 	NO_MEMMEM = YesPlease
 	BASIC_CFLAGS += -I/usr/local/include