diff --git a/ports-mgmt/Makefile b/ports-mgmt/Makefile
index 9ed329c232c0..48589ad362f0 100644
--- a/ports-mgmt/Makefile
+++ b/ports-mgmt/Makefile
@@ -71,6 +71,7 @@
     SUBDIR += portupdate-scan
     SUBDIR += portupgrade
     SUBDIR += portupgrade-devel
+    SUBDIR += poudriere
     SUBDIR += psearch
     SUBDIR += pver
     SUBDIR += qtpkg
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile
new file mode 100644
index 000000000000..cd0c673a5781
--- /dev/null
+++ b/ports-mgmt/poudriere/Makefile
@@ -0,0 +1,34 @@
+# New ports collection makefile for:	poudriere
+# Date created:		2012-01-31
+# Whom:			Baptiste Daroussin <bapt@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	poudriere
+PORTVERSION=	1.0
+CATEGORIES=	ports-mgmt
+MASTER_SITES=	http://files.etoilebsd.net/poudriere/
+
+MAINTAINER=	bapt@FreeBSD.org
+COMMENT=	Port build and test system
+
+LICENSE=	BSD
+
+NO_BUILD=	yes
+MANCOMPRESSED=	yes
+MAN8=	poudriere.8
+
+PLIST_FILES=	etc/poudriere.conf.sample \
+		bin/poudriere \
+		share/poudriere/common.sh \
+		share/poudriere/test_ports.sh \
+		share/poudriere/ports.sh \
+		share/poudriere/jail.sh \
+		share/poudriere/bulk.sh
+PLIST_DIRS=	share/poudriere
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/conf/poudriere.conf.sample ${PREFIX}/etc
+
+.include <bsd.port.mk>
diff --git a/ports-mgmt/poudriere/distinfo b/ports-mgmt/poudriere/distinfo
new file mode 100644
index 000000000000..e8c6a3e37366
--- /dev/null
+++ b/ports-mgmt/poudriere/distinfo
@@ -0,0 +1,2 @@
+SHA256 (poudriere-1.0.tar.gz) = a8722d67b1f90f0a045bfba8cd3f3fd12086ef25778066b4a0ee2e21e63f49e1
+SIZE (poudriere-1.0.tar.gz) = 17254
diff --git a/ports-mgmt/poudriere/pkg-descr b/ports-mgmt/poudriere/pkg-descr
new file mode 100644
index 000000000000..29bd8c113d83
--- /dev/null
+++ b/ports-mgmt/poudriere/pkg-descr
@@ -0,0 +1,5 @@
+poudriere is a tool primarily designed to test package production on
+FreeBSD. However, most people will find it useful to bulk build ports
+for FreeBSD.
+
+WWW:	http://git.etoilebsd.net/poudriere/