diff --git a/devel/freelibiberty/Makefile b/devel/freelibiberty/Makefile
index 2a05dc239aec..9a5ad75b9bd9 100644
--- a/devel/freelibiberty/Makefile
+++ b/devel/freelibiberty/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	freelibiberty
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.vocito.com/downloads/software/libiberty/ \
 		ftp://ftp.vocito.com/pub/vocito.com/software/libiberty/
@@ -15,15 +16,14 @@ DISTNAME=	libiberty-${PORTVERSION}
 MAINTAINER=	ports@vocito.com
 COMMENT=	A freely-redistributable libiberty clone
 
-CONFLICTS=	libgnugetopt-*
-
 INSTALLS_SHLIB=	yes
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/libiberty.a ${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/libiberty.so.1 ${PREFIX}/lib
 	${LN} -sf ${PREFIX}/lib/libiberty.so.1 ${PREFIX}/lib/libiberty.so
-	${INSTALL_DATA} ${WRKSRC}/libiberty.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include
+	${MKDIR} ${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/libiberty.h ${PREFIX}/include/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/getopt.h ${PREFIX}/include/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/freelibiberty/pkg-plist b/devel/freelibiberty/pkg-plist
index 62438530d70b..aa50b5e39c3f 100644
--- a/devel/freelibiberty/pkg-plist
+++ b/devel/freelibiberty/pkg-plist
@@ -1,5 +1,5 @@
-include/libiberty.h
-include/getopt.h
+include/freelibiberty/libiberty.h
+include/freelibiberty/getopt.h
 lib/libiberty.a
 lib/libiberty.so
 lib/libiberty.so.1