diff -ruN i3.bak/Makefile i3/Makefile
--- i3.bak/Makefile	2011-07-24 11:44:28.000000000 +0300
+++ i3/Makefile	2011-08-23 22:39:04.264530030 +0300
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	i3
-DISTVERSION=	3.e-bf3
+DISTVERSION=	4.0.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3wm.org/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -20,6 +20,8 @@
 		ev.3:${PORTSDIR}/devel/libev \
 		yajl.1:${PORTSDIR}/devel/yajl
 
+RUN_DEPENDS=	${LOCALBASE}/lib/libfl.a:${PORTSDIR}/textproc/flex
+
 USE_XORG=	x11
 USE_BISON=	build
 USE_XLIB=	yes
@@ -29,15 +31,19 @@
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/i3 \
-		bin/i3-msg \
+		bin/i3-config-wizard \
 		bin/i3-input \
+		bin/i3-msg \
+		bin/i3-nagbar \
+		bin/i3bar \
 		etc/i3/config.sample \
 		etc/i3/welcome
+
 PLIST_DIRS=	etc/i3
 
-MAN1=	i3.1 \
-	i3-msg.1 \
-	i3-input.1
+MANUALS=	i3-config-wizard.1 i3-input.1 i3-migrate-config-to-v4.1 i3-msg.1 i3-nagbar.1 i3-wsbar.1 i3.1
+
+MAN1=	${MANUALS}
 
 .include <bsd.port.pre.mk>
 
@@ -56,17 +62,19 @@
 	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}/|g' ${WRKSRC}/man/i3-input.1
 	@${REINPLACE_CMD} -e 's|.SILENT||g' ${WRKSRC}/common.mk
 	@${REINPLACE_CMD} -e 's|-Iinclude|-Iinclude -Isrc|g' ${WRKSRC}/common.mk
+	@${REINPLACE_CMD} -e 's|flex|${LOCALBASE}/bin/flex|g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-msg/${PORTNAME}-msg ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-input/${PORTNAME}-input ${PREFIX}/bin/
+.for i in i3-config-wizard i3-input i3-msg i3-nagbar i3bar
+	${INSTALL_SCRIPT} ${WRKSRC}/$i/$i ${PREFIX}/bin/
+.endfor
 	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
-	${INSTALL_SCRIPT} ${WRKSRC}/welcome ${PREFIX}/etc/${PORTNAME}/welcome
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-msg.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}-input.1 ${MANPREFIX}/man/man1
+	${INSTALL_DATA} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/welcome ${PREFIX}/etc/${PORTNAME}/welcome
+.for i in ${MANUALS}
+	${INSTALL_MAN} ${WRKSRC}/man/${i} ${MANPREFIX}/man/man1/
+.endfor
 
 	@${ECHO_MSG} "======================================================================================"
 	@${ECHO_MSG} ""
diff -ruN i3.bak/distinfo i3/distinfo
--- i3.bak/distinfo	2011-07-24 11:44:28.000000000 +0300
+++ i3/distinfo	2011-08-23 20:11:22.819998670 +0300
@@ -1,2 +1,2 @@
-SHA256 (i3-3.e-bf3.tar.bz2) = e0a7b030ebbad0ebf2ac39f235dd5e0ad34ef0ff5b83e31501a361f92e85c68f
-SIZE (i3-3.e-bf3.tar.bz2) = 360704
+SHA256 (i3-4.0.1.tar.bz2) = 2bd27c344d8657f730ac4eeb3e12f1461ebc212a2551b1bd4835541487965756
+SIZE (i3-4.0.1.tar.bz2) = 472222