diff --git a/devel/ruby-daemon_controller/Makefile b/devel/ruby-daemon_controller/Makefile
new file mode 100644
index 00000000000..707d516d506
--- /dev/null
+++ b/devel/ruby-daemon_controller/Makefile
@@ -0,0 +1,25 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2011/11/17 15:33:29 jeremy Exp $
+
+COMMENT =		robust daemon management
+
+DISTNAME =		daemon_controller-0.2.6
+CATEGORIES =		devel
+
+HOMEPAGE =		https://github.com/FooBarWidget/daemon_controller
+
+MAINTAINER =		Jeremy Evans <jeremy@openbsd.org>
+
+# MIT
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =	Yes
+PERMIT_DISTFILES_FTP =	Yes
+
+MODULES =		lang/ruby
+
+CONFIGURE_STYLE =	ruby gem
+
+MODRUBY_REGRESS =	rspec2
+MODRUBY_REGRESS_TARGET = spec/daemon_controller_spec.rb
+
+.include <bsd.port.mk>
diff --git a/devel/ruby-daemon_controller/distinfo b/devel/ruby-daemon_controller/distinfo
new file mode 100644
index 00000000000..c413bfba511
--- /dev/null
+++ b/devel/ruby-daemon_controller/distinfo
@@ -0,0 +1,5 @@
+MD5 (daemon_controller-0.2.6.gem) = W+as9z9+Zhm31OSkQKvZYA==
+RMD160 (daemon_controller-0.2.6.gem) = 2rd9y3YdnUy94Wsa8JJR4EoOXHg=
+SHA1 (daemon_controller-0.2.6.gem) = PTnxei1FXSRsyamLl+zFxCv7Xro=
+SHA256 (daemon_controller-0.2.6.gem) = QtQDqU4NvUy0EKxvscR3FyypzonmeE5a8w4jqJdTaqM=
+SIZE (daemon_controller-0.2.6.gem) = 22016
diff --git a/devel/ruby-daemon_controller/pkg/DESCR b/devel/ruby-daemon_controller/pkg/DESCR
new file mode 100644
index 00000000000..e2f43050d6c
--- /dev/null
+++ b/devel/ruby-daemon_controller/pkg/DESCR
@@ -0,0 +1,26 @@
+daemon_controller is a library for starting and stopping specific
+daemons programmatically in a robust, race-condition-free manner.
+
+It's not a daemon monitoring system like God or Monit. It's also not a
+library for writing daemons.
+
+It provides the following functionality:
+
+    Starting daemons. If the daemon fails to start then an exception
+    will be raised. daemon_controller can even detect failures that
+    occur after the daemon has already daemonized.
+
+    Starting daemons is done in a race-condition-free manner. If another
+    process using daemon_controller is trying to start the same daemon,
+    then daemon_controller will guarantee serialization.
+
+    daemon_controller also raises an exception if it detects that the
+    daemon is already started.
+
+    Connecting to a daemon, starting it if it's not already started.
+    This too is done in a race-condition-free manner. If the daemon
+    fails to start then an exception will be raised.
+
+    Stopping daemons.
+
+    Checking whether a daemon is running.
diff --git a/devel/ruby-daemon_controller/pkg/PLIST b/devel/ruby-daemon_controller/pkg/PLIST
new file mode 100644
index 00000000000..bc10f74166d
--- /dev/null
+++ b/devel/ruby-daemon_controller/pkg/PLIST
@@ -0,0 +1,18 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2011/11/17 15:33:29 jeremy Exp $
+${GEM_LIB}/cache/${DISTNAME}.gem
+${GEM_LIB}/gems/${DISTNAME}/
+${GEM_LIB}/gems/${DISTNAME}/LICENSE.txt
+${GEM_LIB}/gems/${DISTNAME}/README.markdown
+${GEM_LIB}/gems/${DISTNAME}/daemon_controller.gemspec
+${GEM_LIB}/gems/${DISTNAME}/lib/
+${GEM_LIB}/gems/${DISTNAME}/lib/daemon_controller/
+${GEM_LIB}/gems/${DISTNAME}/lib/daemon_controller.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/daemon_controller/lock_file.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/daemon_controller/spawn.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/daemon_controller/version.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/
+${GEM_LIB}/gems/${DISTNAME}/spec/daemon_controller_spec.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/echo_server.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/test_helper.rb
+${GEM_LIB}/gems/${DISTNAME}/spec/unresponsive_daemon.rb
+${GEM_LIB}/specifications/${DISTNAME}.gemspec