diff --git a/sysutils/ruby-puppet/Makefile b/sysutils/ruby-puppet/Makefile
index 2d0977b8026..b1d74541231 100644
--- a/sysutils/ruby-puppet/Makefile
+++ b/sysutils/ruby-puppet/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.37 2011/11/24 18:45:14 robert Exp $
+# $OpenBSD: Makefile,v 1.38 2012/01/18 14:47:04 ajacoutot Exp $
 
 COMMENT=	centralised configuration management for networks
 
 VERSION=	2.7.5
 DISTNAME=	puppet-${VERSION}
 PKGNAME=	ruby-${DISTNAME}
-REVISION=	1
+REVISION=	2
 CATEGORIES=	sysutils net
 
 HOMEPAGE=	http://reductivelabs.com/projects/puppet/
diff --git a/sysutils/ruby-puppet/pkg/puppetd.rc b/sysutils/ruby-puppet/pkg/puppetd.rc
index 2c1ffab3d62..b0bab8c4152 100644
--- a/sysutils/ruby-puppet/pkg/puppetd.rc
+++ b/sysutils/ruby-puppet/pkg/puppetd.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: puppetd.rc,v 1.1 2011/03/20 15:46:34 ajacoutot Exp $
+# $OpenBSD: puppetd.rc,v 1.2 2012/01/18 14:47:05 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/puppetd"
 
@@ -9,4 +9,10 @@ daemon="${TRUEPREFIX}/sbin/puppetd"
 pexp=".*ruby.* ${daemon}${daemon_flags:+ ${daemon_flags}}"
 rc_reload=NO
 
+# XXX can't stop within a fair amount of time when puppetmasterd is unreachable;
+# related to: http://projects.puppetlabs.com/issues/11360 ?
+rc_stop() {
+	pkill -9 -f "^${pexp}"
+}
+
 rc_cmd $1