diff --git a/net/ruby-amqp-utils/Makefile b/net/ruby-amqp-utils/Makefile
new file mode 100644
index 00000000000..a4511ce86a5
--- /dev/null
+++ b/net/ruby-amqp-utils/Makefile
@@ -0,0 +1,29 @@
+# $OpenBSD: Makefile,v 1.1.1.1 2009/11/22 06:52:36 msf Exp $
+
+COMMENT =	AMQP command line utilities
+
+DISTNAME =	amqp-utils-0.1.2
+PKGNAME =	ruby-${DISTNAME}
+CATEGORIES =	net
+
+# MIT
+PERMIT_PACKAGE_CDROM=	Yes
+PERMIT_PACKAGE_FTP=	Yes
+PERMIT_DISTFILES_CDROM=	Yes
+PERMIT_DISTFILES_FTP=	Yes
+
+MASTER_SITES =	${MASTER_SITE_RUBYFORGE:=amqp-utils/}
+
+MODULES =	lang/ruby
+
+CONFIGURE_STYLE = ruby gem
+
+BUILD_DEPENDS =	${RUN_DEPENDS}
+RUN_DEPENDS =	:ruby-facets->=2.7.0:devel/ruby-facets \
+		:ruby-trollop->=1.10.2:devel/ruby-trollop \
+		:ruby-amqp->=0.6.0:net/ruby-amqp \
+		::devel/ruby-clio
+
+GEM_SKIPDEPENDS = tmm1-amqp trollop
+
+.include <bsd.port.mk>
diff --git a/net/ruby-amqp-utils/distinfo b/net/ruby-amqp-utils/distinfo
new file mode 100644
index 00000000000..5d2c419ef05
--- /dev/null
+++ b/net/ruby-amqp-utils/distinfo
@@ -0,0 +1,5 @@
+MD5 (amqp-utils-0.1.2.gem) = DhWaLiLe+SrCqf2NglHVKQ==
+RMD160 (amqp-utils-0.1.2.gem) = j09dHbYHAnske8neA/fI5D7qC80=
+SHA1 (amqp-utils-0.1.2.gem) = M2moOux+xfUIjAoYP4UqZhtrQkU=
+SHA256 (amqp-utils-0.1.2.gem) = ri9FmsypgnkH84Iczz2fJAPsHKTKU5kJ8Hk1RnRlReU=
+SIZE (amqp-utils-0.1.2.gem) = 9216
diff --git a/net/ruby-amqp-utils/patches/patch-lib_amqp_utils_rb b/net/ruby-amqp-utils/patches/patch-lib_amqp_utils_rb
new file mode 100644
index 00000000000..24c34bb9b47
--- /dev/null
+++ b/net/ruby-amqp-utils/patches/patch-lib_amqp_utils_rb
@@ -0,0 +1,12 @@
+$OpenBSD: patch-lib_amqp_utils_rb,v 1.1.1.1 2009/11/22 06:52:36 msf Exp $
+--- lib/amqp_utils.rb.orig	Wed Nov  4 14:39:02 2009
++++ lib/amqp_utils.rb	Wed Nov  4 14:39:09 2009
+@@ -10,7 +10,7 @@ require 'rubygems'
+ gem 'trollop'
+ require 'trollop'
+ 
+-gem 'tmm1-amqp'
++gem 'amqp'
+ require 'mq'
+ 
+ gem 'facets'
diff --git a/net/ruby-amqp-utils/pkg/DESCR b/net/ruby-amqp-utils/pkg/DESCR
new file mode 100644
index 00000000000..70fdbf6f21d
--- /dev/null
+++ b/net/ruby-amqp-utils/pkg/DESCR
@@ -0,0 +1,7 @@
+CLI utility programs for interacting with an AMQP queue. Using these
+utilities, one can interact with an AMQP queue from the command line or
+via a shell script.
+
+These utilities have been tested against RabbitMQ, but they should work
+with other AMQP compliant queues. They depend on the amqp gem available
+at <http://github.com/tmm1/amqp>.
diff --git a/net/ruby-amqp-utils/pkg/PLIST b/net/ruby-amqp-utils/pkg/PLIST
new file mode 100644
index 00000000000..be3a15e801f
--- /dev/null
+++ b/net/ruby-amqp-utils/pkg/PLIST
@@ -0,0 +1,77 @@
+@comment $OpenBSD: PLIST,v 1.1.1.1 2009/11/22 06:52:36 msf Exp $
+bin/amqp-deleteq
+bin/amqp-dequeue
+bin/amqp-enqueue
+bin/amqp-peek
+bin/amqp-pop
+bin/amqp-purge
+bin/amqp-statq
+lib/ruby/gems/${MODRUBY_REV}/cache/${DISTNAME}.gem
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000001.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000002.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000003.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000004.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000005.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000006.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000007.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000008.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/classes/AmqpUtils/Command.src/M000009.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/created.rid
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/README_txt.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/amqp_utils/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/amqp_utils/command_rb.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/files/lib/amqp_utils_rb.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/fr_class_index.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/fr_file_index.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/fr_method_index.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/index.html
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/rdoc/rdoc-style.css
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/amqp-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/cdesc-Command.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/command_name-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/go-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/mq-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/new-c.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/process_options-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/run-c.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/validate-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/Command/version-i.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/AmqpUtils/cdesc-AmqpUtils.yaml
+lib/ruby/gems/${MODRUBY_REV}/doc/${DISTNAME}/ri/created.rid
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/.gitignore
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/History.txt
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/License.txt
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/README.txt
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/Rakefile
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/TODO.txt
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/VERSION
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/amqp-utils.gemspec
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-deleteq
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-dequeue
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-enqueue
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-peek
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-pop
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-purge
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/bin/amqp-statq
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/amqp_utils/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/amqp_utils.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/lib/amqp_utils/command.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/test_amqp_utils.rb
+lib/ruby/gems/${MODRUBY_REV}/gems/${DISTNAME}/test/test_helper.rb
+lib/ruby/gems/${MODRUBY_REV}/specifications/${DISTNAME}.gemspec