--- a/AUTHORS	Thu Jul 14 02:33:28 2016 +0100
+++ b/AUTHORS	Thu Jul 14 03:35:55 2016 +0100
@@ -2,6 +2,7 @@
 Please keep this list in alphabetical order.
 
 Lillian Angel <langel@redhat.com>
+Aleksandar Antok <http://www.aleksandara.net>
 Alon Bar-Lev <alon.barlev@gmail.com>
 Gary Benson <gbenson@redhat.com>
 Tania Bento <tbento@redhat.com>
@@ -22,6 +23,7 @@
 Radim Kolar <hsn@sanatana.filez.com>
 Matthias Klose <doko@ubuntu.com>
 Francis Kung <fkung@redhat.com>
+Trustin Lee <http://t.motd.kr>
 DJ Lucas <dj@linuxfromscratch.org>
 Omair Majid <omajid@redhat.com>
 Casey Marshall <csm@gnu.org>

--- a/ChangeLog	Thu Jul 14 02:33:28 2016 +0100
+++ b/ChangeLog	Thu Jul 14 03:35:55 2016 +0100
@@ -1,3 +1,35 @@
+2016-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(ICEDTEA_CONFIGURE): Pass --enable-infinality or
+	--disable-infinality, depending on whether or
+	not infinality is enabled.
+	* acinclude.m4:
+	(IT_CHECK_FOR_FONTCONFIG): Removed.
+	(IT_ENABLE_INFINALITY): Merge fontconfig detection
+	from IT_CHECK_FOR_FONTCONFIG into this macro, as
+	currently we only need to link against fontconfig
+	for infinality support.
+
+2014-06-12  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* AUTHORS:
+	Add authors of infinality patch. Websites are used
+	as present as couldn't find any e-mail addresses.
+	* INSTALL: Document --enable-infinality.
+	* acinclude.m4:
+	(IT_ENABLE_INFINALITY): Macro for new option.
+	* configure.ac: Invoke IT_ENABLE_INFINALITY instead
+	of its dependency, IT_CHECK_FOR_FONTCONFIG.
+
+2011-09-21  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_ENV): Set FONTCONFIG_LIBS & FONTCONFIG_CFLAGS.
+	* acinclude.m4:
+	(IT_CHECK_FOR_FONTCONFIG): Detect fontconfig.
+	* configure.ac: Add call to IT_CHECK_FOR_FONTCONFIG.
+
 2016-07-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	Bump to icedtea-3.1.0pre03.

--- a/INSTALL	Thu Jul 14 02:33:28 2016 +0100
+++ b/INSTALL	Thu Jul 14 03:35:55 2016 +0100
@@ -212,6 +212,7 @@
   below.
 * --enable-sunec: Build the SunEC crypto provider against system NSS.
 * --enable-non-nss-curves: Define curves beyond the three specified by NSS (NIST P-{256,384,521})
+* --enable-infinality: Use fontconfig for better font rendering
 
 Testing
 =======

--- a/Makefile.am	Thu Jul 14 02:33:28 2016 +0100
+++ b/Makefile.am	Thu Jul 14 03:35:55 2016 +0100
@@ -493,6 +493,14 @@
 	--with-cacerts-file=$(CACERTS_FILE)
 endif
 
+if ENABLE_INFINALITY
+ICEDTEA_CONFIGURE += \
+	--enable-infinality
+else
+ICEDTEA_CONFIGURE += \
+	--disable-infinality
+endif
+
 ICEDTEA_UNSET = \
 	JAVAC= \
 	JAVA_HOME= \
@@ -582,6 +590,12 @@
 	NSS_CFLAGS="${SUNEC_CFLAGS}"
 endif
 
+if ENABLE_INFINALITY
+ICEDTEA_ENV += \
+	FONTCONFIG_LIBS="${FONTCONFIG_LIBS}" \
+	FONTCONFIG_CFLAGS="${FONTCONFIG_CFLAGS}"
+endif
+
 # OpenJDK boot build environment.
 ICEDTEA_CONFIGURE_BOOT = $(ICEDTEA_CONFIGURE)
 ICEDTEA_ENV_BOOT = $(ICEDTEA_ENV) \

--- a/acinclude.m4	Thu Jul 14 02:33:28 2016 +0100
+++ b/acinclude.m4	Thu Jul 14 03:35:55 2016 +0100
@@ -1916,6 +1916,38 @@
   AC_SUBST([ICEDTEA_BRANCH])
 ])
 
+AC_DEFUN_ONCE([IT_ENABLE_INFINALITY],
+[
+  AC_MSG_CHECKING([whether to use fontconfig to provide better font rendering])
+  AC_ARG_ENABLE([infinality],
+                [AS_HELP_STRING(--enable-infinality,build with fontconfig font rendering [[default=yes]])],
+  [
+    case "${enableval}" in
+      yes)
+        enable_infinality=yes
+        ;;
+      *)
+        enable_infinality=no
+        ;;
+    esac
+  ],
+  [
+    enable_infinality=yes
+  ])
+  AC_MSG_RESULT([$enable_infinality])
+  AM_CONDITIONAL([ENABLE_INFINALITY], test x"${enable_infinality}" = "xyes")
+  if test "x${enable_infinality}" = "xyes"; then
+    dnl Check for Fontconfig+ headers and libraries.
+    PKG_CHECK_MODULES(FONTCONFIG, fontconfig,[FONTCONFIG_FOUND=yes],[FONTCONFIG_FOUND=no])
+    if test "x${FONTCONFIG_FOUND}" = xno
+    then
+      AC_MSG_ERROR([Infinality support requires fontconfig. Either install fontconfig or --disable-infinality])
+    fi
+    AC_SUBST(FONTCONFIG_CFLAGS)
+    AC_SUBST(FONTCONFIG_LIBS)
+  fi
+])
+
 AC_DEFUN_ONCE([IT_HAS_NATIVE_HOTSPOT_PORT],
 [
   AC_MSG_CHECKING([if a native HotSpot port is available for this architecture])

--- a/configure.ac	Thu Jul 14 02:33:28 2016 +0100
+++ b/configure.ac	Thu Jul 14 03:35:55 2016 +0100
@@ -152,6 +152,7 @@
 IT_CHECK_FOR_PNG
 IT_CHECK_FOR_GIF
 IT_CHECK_FOR_LCMS
+IT_ENABLE_INFINALITY
 AC_CONFIG_FILES([remove-intree-libraries.sh])
 
 dnl Check for Xproto headers and libraries.