diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index 42c2c3726096..d15118b60e13 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -1,35 +1,36 @@
 # New ports collection makefile for:	fontconfig
 # Date created:		06 October 2002
 # Whom:			Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.0
+PORTREVISION=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
 DISTNAME=	fcpackage.${PORTVERSION:S/./_/}
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.4:${PORTSDIR}/textproc/expat2
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat=${LOCALBASE} \
 		--with-default-fonts=${X11BASE}/lib/fonts
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
 WRKSRC=	${WRKDIR}/${DISTNAME}/fontconfig
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|[(]LIBDIR[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-fonts/fontconfig/files/patch-src_Makefile.in b/x11-fonts/fontconfig/files/patch-src_Makefile.in
index 16e62724d1b8..f4869f5675a6 100644
--- a/x11-fonts/fontconfig/files/patch-src_Makefile.in
+++ b/x11-fonts/fontconfig/files/patch-src_Makefile.in
@@ -1,13 +1,51 @@
---- src/Makefile.in.orig	Sun Oct  6 16:42:26 2002
-+++ src/Makefile.in	Sun Oct  6 16:42:42 2002
-@@ -80,10 +80,6 @@
+--- src/Makefile.in.orig	Sun Oct  6 23:23:09 2002
++++ src/Makefile.in	Sun Oct  6 23:26:11 2002
+@@ -71,7 +71,7 @@
+ .c.@OBJEXT@:
+ 	$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) -c $< -o $@
+ 	
+-all:: $(LIBFILE) $(LIBMAJOR) $(LIBBASE)
++all:: $(LIBFILE) $(LIBBASE)
+ 
+ # 
+ # build the library and the various version links
+@@ -80,13 +80,9 @@
  	rm -f $@
  	$(MKSHLIB) $(OBJS) $(LIBS)
  
 -$(LIBMAJOR): $(LIBFILE)
 -	rm -f  $@
 -	$(LN_S) $(LIBFILE) $(LIBMAJOR)
 -
- $(LIBBASE): $(LIBMAJOR)
+-$(LIBBASE): $(LIBMAJOR)
++$(LIBBASE): $(LIBFILE)
  	rm -f $@
- 	$(LN_S) $(LIBMAJOR) $(LIBBASE)
+-	$(LN_S) $(LIBMAJOR) $(LIBBASE)
++	$(LN_S) $(LIBFILE) $(LIBBASE)
+ 
+ $(OBJS): fcint.h $(HEADERS)
+ 
+@@ -102,19 +98,15 @@
+ # install library
+ #
+ 
+-install:: $(DESTDIR)$(LIBDIR)/$(LIB) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
++install:: $(DESTDIR)$(LIBDIR)/$(LIBFILE)
+ install:: $(DESTDIR)$(LIBDIR)/$(LIBBASE)
+ 
+ $(DESTDIR)$(LIBDIR)/$(LIBFILE): $(LIBFILE)
+ 	$(INSTALL_PROGRAM) $< $(DESTDIR)$(LIBDIR)/$<
+ 
+-$(DESTDIR)$(LIBDIR)/$(LIBMAJOR): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
+-	rm -f $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
+-	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
+-
+-$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBMAJOR)
++$(DESTDIR)$(LIBDIR)/$(LIBBASE): $(DESTDIR)$(LIBDIR)/$(LIBFILE)
+ 	rm -f $(DESTDIR)$(LIBDIR)/$(LIBBASE)
+-	$(LN_S) $(LIBMAJOR) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
++	$(LN_S) $(LIBFILE) $(DESTDIR)$(LIBDIR)/$(LIBBASE)
+ 
+ clean::
+-	rm -f $(LIBFILE) $(LIBMAJOR) $(LIBBASE) $(OBJS)
++	rm -f $(LIBFILE) $(LIBBASE) $(OBJS)