diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index ab970a09b580..eb23f356562b 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	i3
-DISTVERSION=	3.a-bf2
-PORTREVISION=	1
+DISTVERSION=	3.b
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://i3.zekjur.net/downloads/ \
 		${MASTER_SITE_LOCAL}
@@ -16,8 +15,12 @@ MASTER_SITE_SUBDIR=	dhn
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	An improved dynamic tiling window manager
 
+BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
+		readlink:${PORTSDIR}/sysutils/readlink \
+		xmlto:${PORTSDIR}/textproc/xmlto
 LIB_DEPENDS=	xcb.2:${PORTSDIR}/x11/libxcb \
-		xcb-event.1:${PORTSDIR}/x11/xcb-util
+		xcb-event.1:${PORTSDIR}/x11/xcb-util \
+		ev.3:${PORTSDIR}/devel/libev
 
 USE_XORG=	x11
 USE_BZIP2=	yes
@@ -25,9 +28,36 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/i3
+PLIST_FILES=	bin/i3 \
+		etc/i3/config.sample
+PLIST_DIRS=	etc/i3
+
+MAN1=	i3.1
+
+post-extract:
+	@cd ${WRKSRC} && ${CP} i3.config config.sample
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' ${WRKSRC}/src/config.c
+	@${REINPLACE_CMD} -e 's|/usr/|${PREFIX}|g' ${WRKSRC}/config.sample
+	@${REINPLACE_CMD} -e 's|PREFIX|${PREFIX}|g' ${WRKSRC}/man/Makefile
+
+# Create the manpage
+post-build:
+	@cd ${WRKSRC} && ${GMAKE} -C man
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin/
+	@${MKDIR} ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/config.sample ${PREFIX}/etc/${PORTNAME}
+	${INSTALL_MAN} ${WRKSRC}/man/${MAN1} ${MANPREFIX}/man/man1
+
+	@${ECHO_MSG} "======================================================================================"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	${PORTNAME} need a config file! A example do you found on ${PREFIX}/etc/${PORTNAME}"
+	@${ECHO_MSG} "	Please rename it in ${PREFIX}/etc/${PORTNAME}/config"
+	@${ECHO_MSG} "	For more information read the manpage :)"
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "======================================================================================"
 
 .include <bsd.port.mk>
diff --git a/x11-wm/i3/distinfo b/x11-wm/i3/distinfo
index 91575346cf37..de4025e58619 100644
--- a/x11-wm/i3/distinfo
+++ b/x11-wm/i3/distinfo
@@ -1,3 +1,3 @@
-MD5 (i3-3.a-bf2.tar.bz2) = de67d1353b83cf38064d761879a1e224
-SHA256 (i3-3.a-bf2.tar.bz2) = 64d8f4f165cc15a9229acfac4b106ab470e0d28cc176931a7de9f5476b0a24ba
-SIZE (i3-3.a-bf2.tar.bz2) = 65619
+MD5 (i3-3.b.tar.bz2) = 997a46902d7a12bd5a247d3c436cc8c0
+SHA256 (i3-3.b.tar.bz2) = 87330b10fc7482971462fd65fceb0b30cb5f686a180ff29e06bd7f3f89c4194e
+SIZE (i3-3.b.tar.bz2) = 97884
diff --git a/x11-wm/i3/files/patch-man_Makefile b/x11-wm/i3/files/patch-man_Makefile
new file mode 100644
index 000000000000..99f4f3736f03
--- /dev/null
+++ b/x11-wm/i3/files/patch-man_Makefile
@@ -0,0 +1,8 @@
+--- man/Makefile.orig	2009-06-29 20:42:52.000000000 +0200
++++ man/Makefile	2009-06-29 20:43:13.000000000 +0200
+@@ -1,4 +1,4 @@
+ all:
+-	a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man
++	PATH=PREFIX/bin:/usr/bin /usr/local/bin/a2x -f manpage --asciidoc-opts="-f asciidoc.conf" i3.man
+ clean:
+ 	rm -f i3.xml i3.1 i3.html