diff --git a/x11-wm/bspwm/Makefile b/x11-wm/bspwm/Makefile
index d21c88da43dc..51d6f60ca095 100644
--- a/x11-wm/bspwm/Makefile
+++ b/x11-wm/bspwm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bspwm
-PORTVERSION=	0.8.9
+PORTVERSION=	0.9
 CATEGORIES=	x11-wm
 
 MAINTAINER=	antont@inbox.lv
@@ -13,11 +13,12 @@ RUN_DEPENDS=	sxhkd:${PORTSDIR}/x11/sxhkd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	baskerville
-GH_COMMIT=	1c5c3a1
+GH_COMMIT=	cbaf43e
 
-USES=		gmake
+USES=		gmake shebangfix
+SHEBANG_FILES=	contrib/freedesktop/bspwm-session
 
-OPTIONS_DEFINE=	EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/x11-wm/bspwm/distinfo b/x11-wm/bspwm/distinfo
index e1e563f3ea0e..a4abe4410934 100644
--- a/x11-wm/bspwm/distinfo
+++ b/x11-wm/bspwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bspwm-0.8.9.tar.gz) = 841c9730ad16f63c74de0854bfc1eb1edb67baa6f6e797a1a8b59ec48929d249
-SIZE (bspwm-0.8.9.tar.gz) = 65651
+SHA256 (bspwm-0.9.tar.gz) = 15d7b764aeb10194996e7d56b637488ec11496051d9309ba91bf6f33c4764398
+SIZE (bspwm-0.9.tar.gz) = 62832
diff --git a/x11-wm/bspwm/pkg-plist b/x11-wm/bspwm/pkg-plist
index 354f8eb501b8..30ae97b70666 100644
--- a/x11-wm/bspwm/pkg-plist
+++ b/x11-wm/bspwm/pkg-plist
@@ -1,22 +1,35 @@
 bin/bspc
 bin/bspwm
-share/bash-completion/completions/bspc
+bin/bspwm-session
 man/man1/bspc.1.gz
 man/man1/bspwm.1.gz
-share/zsh/site-functions/_bspc
+share/bash-completion/completions/bspc
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
+%%PORTDOCS%%%%DOCSDIR%%/MISC.md
+%%PORTDOCS%%%%DOCSDIR%%/TODO.md
+%%PORTDOCS%%%%DOCSDIR%%/examples/bspwmrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/external_rules/bspwmrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/external_rules/external_rules
+%%PORTDOCS%%%%DOCSDIR%%/examples/loop/bspwmrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/loop/profile
+%%PORTDOCS%%%%DOCSDIR%%/examples/loop/sxhkdrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/loop/wm
+%%PORTDOCS%%%%DOCSDIR%%/examples/loop/xinitrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/overlapping_borders/bspwmrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/bspwmrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel_bar
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/panel_colors
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/profile
+%%PORTDOCS%%%%DOCSDIR%%/examples/panel/sxhkdrc
+%%PORTDOCS%%%%DOCSDIR%%/examples/sxhkdrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/bspwmrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sxhkdrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/bspwmrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/external_rules
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/README.asciidoc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/bspwm_rules
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/bspwmrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/external_rules
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/rulc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/external_rules/lua/ruld
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/bspwmrc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/sxhkdrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/profile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/sxhkdrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/wm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/loop/xinitrc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/overlapping_borders/bspwmrc
@@ -24,6 +37,8 @@ share/zsh/site-functions/_bspc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_bar
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_colors
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/panel_dzen2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/profile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/panel/sxhkdrc
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sxhkdrc
+share/xsessions/bspwm.desktop
+share/zsh/site-functions/_bspc