diff --git a/x11-wm/rubygem-uh-wm/Makefile b/x11-wm/rubygem-uh-wm/Makefile
index 2f6b43ac0af9..f73f92d7dce0 100644
--- a/x11-wm/rubygem-uh-wm/Makefile
+++ b/x11-wm/rubygem-uh-wm/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	uh-wm
-PORTVERSION=	0.0.15
+PORTVERSION=	0.2.1
 CATEGORIES=	x11-wm rubygems
 MASTER_SITES=	RG
 
@@ -10,7 +10,8 @@ COMMENT=	Minimalistic tiling and stacking window manager
 
 LICENSE=	BSD3CLAUSE
 
-RUN_DEPENDS=	rubygem-uh>=2.0.2:x11-toolkits/rubygem-uh \
+RUN_DEPENDS=	rubygem-baf>=0.14.0:devel/rubygem-baf \
+		rubygem-uh>=2.1.0:x11-toolkits/rubygem-uh \
 		rubygem-uh-layout>=0.4.2:x11-wm/rubygem-uh-layout \
 		rubygem-rb-kqueue>=0.2.4:devel/rubygem-rb-kqueue
 
diff --git a/x11-wm/rubygem-uh-wm/distinfo b/x11-wm/rubygem-uh-wm/distinfo
index 8cd6309e42c4..66f573f649ce 100644
--- a/x11-wm/rubygem-uh-wm/distinfo
+++ b/x11-wm/rubygem-uh-wm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485455749
-SHA256 (rubygem/uh-wm-0.0.15.gem) = c5f32bfc582cc3e77868bf12c4c9f99376a70dd3f489d780274f682ee63fb678
-SIZE (rubygem/uh-wm-0.0.15.gem) = 18944
+TIMESTAMP = 1508707999
+SHA256 (rubygem/uh-wm-0.2.1.gem) = fa9d749298a2c679d9cc3e1ab4193385c428590b1e2e6dca1f3b2537a89f26cd
+SIZE (rubygem/uh-wm-0.2.1.gem) = 15872