diff --git a/x11-wm/openbox/Makefile b/x11-wm/openbox/Makefile
index 33fe5236be0c..44f363b1238a 100644
--- a/x11-wm/openbox/Makefile
+++ b/x11-wm/openbox/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	openbox
-PORTVERSION=	3.4.11
-PORTREVISION=	1
+PORTVERSION=	3.4.11.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	http://openbox.org/dist/openbox/ \
 		http://dougbarton.us/Downloads/
@@ -28,6 +27,8 @@ CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
 MAN1=		openbox.1 openbox-session.1 obxprop.1 \
 		openbox-gnome-session.1 openbox-kde-session.1
 
+PLIST_SUB=	VERSION=${PORTVERSION}
+
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
diff --git a/x11-wm/openbox/distinfo b/x11-wm/openbox/distinfo
index 23cd9372d900..36c1e7503873 100644
--- a/x11-wm/openbox/distinfo
+++ b/x11-wm/openbox/distinfo
@@ -1,3 +1,3 @@
-MD5 (openbox-3.4.11.tar.gz) = bbbb93c1a4fc8048f2a8ceb4179882a5
-SHA256 (openbox-3.4.11.tar.gz) = 60fe5c1a7bace88381b851cfe51e9f726b148c91aac05163fcad1a2aaad8a051
-SIZE (openbox-3.4.11.tar.gz) = 906947
+MD5 (openbox-3.4.11.1.tar.gz) = 56d1b365a95b119e4809802aeea734fb
+SHA256 (openbox-3.4.11.1.tar.gz) = 960c89a380c7d58f1058590be7215f2f52727b725a979ecac89572e4bcb732ad
+SIZE (openbox-3.4.11.1.tar.gz) = 875340
diff --git a/x11-wm/openbox/pkg-plist b/x11-wm/openbox/pkg-plist
index b85b9c242b36..6aa9c01bcadb 100644
--- a/x11-wm/openbox/pkg-plist
+++ b/x11-wm/openbox/pkg-plist
@@ -8,17 +8,17 @@ bin/openbox-session
 etc/xdg/openbox/autostart.sh
 etc/xdg/openbox/menu.xml
 etc/xdg/openbox/rc.xml
-include/openbox/3.4.11/openbox/color.h
-include/openbox/3.4.11/openbox/font.h
-include/openbox/3.4.11/openbox/geom.h
-include/openbox/3.4.11/openbox/gradient.h
-include/openbox/3.4.11/openbox/image.h
-include/openbox/3.4.11/openbox/instance.h
-include/openbox/3.4.11/openbox/mask.h
-include/openbox/3.4.11/openbox/parse.h
-include/openbox/3.4.11/openbox/render.h
-include/openbox/3.4.11/openbox/theme.h
-include/openbox/3.4.11/openbox/version.h
+include/openbox/%%VERSION%%/openbox/color.h
+include/openbox/%%VERSION%%/openbox/font.h
+include/openbox/%%VERSION%%/openbox/geom.h
+include/openbox/%%VERSION%%/openbox/gradient.h
+include/openbox/%%VERSION%%/openbox/image.h
+include/openbox/%%VERSION%%/openbox/instance.h
+include/openbox/%%VERSION%%/openbox/mask.h
+include/openbox/%%VERSION%%/openbox/parse.h
+include/openbox/%%VERSION%%/openbox/render.h
+include/openbox/%%VERSION%%/openbox/theme.h
+include/openbox/%%VERSION%%/openbox/version.h
 lib/libobparser.a
 lib/libobparser.la
 lib/libobparser.so
@@ -162,8 +162,8 @@ share/xsessions/openbox-kde.desktop
 @dirrmtry share/gnome/wm-properties
 @dirrmtry share/gnome
 @dirrmtry libdata/pkgconfig
-@dirrm include/openbox/3.4.11/openbox
-@dirrm include/openbox/3.4.11
+@dirrm include/openbox/%%VERSION%%/openbox
+@dirrm include/openbox/%%VERSION%%
 @dirrm include/openbox
 @dirrm lib/openbox
 @dirrm etc/xdg/openbox