--- a/jdk/makefiles/lib/Awt2dLibraries.gmk	Tue Oct 22 16:51:37 2013 -0700
+++ b/jdk/makefiles/lib/Awt2dLibraries.gmk	Wed Oct 23 13:06:37 2013 +0200
@@ -780,9 +780,9 @@
   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers
   LIBFONTMANAGER_EXCLUDE_FILES += freetypeScaler.c
 else
-  FONT_HEADERS := $(FREETYPE2_CFLAGS)
+  FONT_HEADERS := $(FREETYPE_CFLAGS)
   BUILD_LIBFONTMANAGER_MAPFILE := $(JDK_TOPDIR)/makefiles/mapfiles/libfontmanager/mapfile-vers.openjdk
-  BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE2_LIBS)
+  BUILD_LIBFONTMANAGER_FONTLIB := $(FREETYPE_LIBS)
 endif
 
 LIBFONTMANAGER_OPTIMIZATION := HIGH