diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index c59ae3c75aaa..a8cc6388d549 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-mixer
 PORTVERSION=	4.11.0
+PORTREVISION=	1
 CATEGORIES=	audio xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/deskutils/xfce4-volumed/Makefile b/deskutils/xfce4-volumed/Makefile
index 635cd8d3c60e..3bd4a827fde8 100644
--- a/deskutils/xfce4-volumed/Makefile
+++ b/deskutils/xfce4-volumed/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	xfce4-volumed
 PORTVERSION=	0.1.13
+PORTREVISION=	1
 CATEGORIES=	deskutils xfce
 MASTER_SITES=	XFCE
 MASTER_SITE_SUBDIR=	src/apps/${PORTNAME}/${PORTVERSION:R}
diff --git a/x11/keybinder/Makefile b/x11/keybinder/Makefile
index 5fd45eb7626e..26cccd4d92c8 100644
--- a/x11/keybinder/Makefile
+++ b/x11/keybinder/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	keybinder
 PORTVERSION=	0.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11
 MASTER_SITES=	GENTOO/distfiles
 
@@ -12,13 +12,15 @@ COMMENT=	Library for registering keyboard shortcuts
 LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc
+USES=		gmake libtool pathfix pkgconfig
 USE_GNOME=	gtk20 introspection:build
 USE_XORG=	x11 xext xrender
-USES=		gmake pkgconfig pathfix
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES PYTHON LUA
-OPTIONS_DEFAULT=	PYTHON
+OPTIONS_DEFAULT=PYTHON
+OPTIONS_SUB=	yes
 
 # Override LUA description
 LUA_DESC=	Lua bindings
@@ -28,30 +30,15 @@ LUA_DESC=	Lua bindings
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	2
 USE_GNOME+=	pygtk2
-PLIST_SUB+=	PYTHON=""
 .else
 CONFIGURE_ARGS+=	--disable-python
-PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MLUA}
 USES+=		lua:51
 CONFIGURE_ARGS+=	--with-lua-includes=${LUA_INCDIR}
-PLIST_SUB+=	LUA=""
 .else
 CONFIGURE_ARGS+=	--disable-lua
-PLIST_SUB+=	LUA="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDOCS}
-BUILD_DEPENDS+=	gtkdoc-check:${PORTSDIR}/textproc/gtk-doc
-CONFIGURE_ARGS+=--enable-gtk-doc \
-	--with-html-dir=${PREFIX}/share/gtk-doc/html
-PLIST_SUB+=	DOCS=""
-.else
-CONFIGURE_ARGS+=--disable-gtk-doc-html \
-	--without-html-dir
-PLIST_SUB+=	DOCS="@comment "
 .endif
 
 post-install:
diff --git a/x11/keybinder/pkg-plist b/x11/keybinder/pkg-plist
index 1dcc5ebe93fb..34e6d481dc41 100644
--- a/x11/keybinder/pkg-plist
+++ b/x11/keybinder/pkg-plist
@@ -1,16 +1,28 @@
 include/keybinder.h
 lib/girepository-1.0/Keybinder-0.0.typelib
-lib/libkeybinder.la
 lib/libkeybinder.so
-lib/libkeybinder.so.1
-%%LUA%%%%LUA_MODLIBDIR%%/keybinder.la
+lib/libkeybinder.so.0
+lib/libkeybinder.so.0.1.0
 %%LUA%%%%LUA_MODLIBDIR%%/keybinder.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/__init__.pyo
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.la
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/keybinder/_keybinder.so
 libdata/pkgconfig/keybinder.pc
+%%PORTDOCS%%%%DOCSDIR%%/annotation-glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/api-index-full.html
+%%PORTDOCS%%%%DOCSDIR%%/ch01.html
+%%PORTDOCS%%%%DOCSDIR%%/deprecated-api-index.html
+%%PORTDOCS%%%%DOCSDIR%%/home.png
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/keybinder-keybinder.html
+%%PORTDOCS%%%%DOCSDIR%%/keybinder.devhelp2
+%%PORTDOCS%%%%DOCSDIR%%/left.png
+%%PORTDOCS%%%%DOCSDIR%%/object-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/right.png
+%%PORTDOCS%%%%DOCSDIR%%/style.css
+%%PORTDOCS%%%%DOCSDIR%%/up.png
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example.lua
@@ -21,24 +33,8 @@ libdata/pkgconfig/keybinder.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/main.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/vexample.vala
 share/gir-1.0/Keybinder-0.0.gir
-%%DOCS%%share/gtk-doc/html/keybinder/annotation-glossary.html
-%%DOCS%%share/gtk-doc/html/keybinder/api-index-full.html
-%%DOCS%%share/gtk-doc/html/keybinder/ch01.html
-%%DOCS%%share/gtk-doc/html/keybinder/deprecated-api-index.html
-%%DOCS%%share/gtk-doc/html/keybinder/home.png
-%%DOCS%%share/gtk-doc/html/keybinder/index.html
-%%DOCS%%share/gtk-doc/html/keybinder/index.sgml
-%%DOCS%%share/gtk-doc/html/keybinder/keybinder-keybinder.html
-%%DOCS%%share/gtk-doc/html/keybinder/keybinder.devhelp2
-%%DOCS%%share/gtk-doc/html/keybinder/left.png
-%%DOCS%%share/gtk-doc/html/keybinder/object-tree.html
-%%DOCS%%share/gtk-doc/html/keybinder/right.png
-%%DOCS%%share/gtk-doc/html/keybinder/style.css
-%%DOCS%%share/gtk-doc/html/keybinder/up.png
-%%DOCS%%@dirrm share/gtk-doc/html/keybinder
-%%DOCS%%@dirrmtry share/gtk-doc/html
-%%DOCS%%@dirrmtry share/gtk-doc
 @dirrmtry share/gir-1.0
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/keybinder
 @dirrmtry lib/girepository-1.0