diff --git a/lib/libexpat/Makefile b/lib/libexpat/Makefile
index e5254d0f4e33..3e98fa03bef3 100644
--- a/lib/libexpat/Makefile
+++ b/lib/libexpat/Makefile
@@ -1,30 +1,26 @@
 # $FreeBSD$
 
-EXPAT=	${.CURDIR}/../../contrib/expat
-
-SHLIB_MAJOR=	1
+EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
-
+SHLIB_MAJOR=	1
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h
 MAN=		libbsdxml.3
 
 .PATH:		${EXPAT}/lib
 
-CFLAGS += 	-I${EXPAT}/lib -I${EXPAT} -I${.CURDIR}
-CLEANFILES+=	bsdxml.h
+CFLAGS+= 	-I${.CURDIR}
+CLEANFILES=	bsdxml.h
 
-#
 # OK, so it is not entirely unadultered: we ammend the COPYING
 # to point people to the right place, get rid of some VMS stuff
 # and use FreeBSD style indempotency #ifndefs.
 #
-bsdxml.h:	expat.h
+bsdxml.h: expat.h
 	unifdef -U__VMS < ${.ALLSRC} | \
 	sed -e 's/XmlParse_INCLUDED/_BSD_XML_H_/' \
 	    -e 's/COPYING/src\/contrib\/expat\/COPYING/' \
 		> ${.TARGET}
 
 .include <bsd.lib.mk>
-