diff --git a/databases/Makefile b/databases/Makefile
index 20170d47dc48..d872447d690a 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -531,6 +531,7 @@
     SUBDIR += pg_rman
     SUBDIR += pgaccess
     SUBDIR += pgadmin3
+    SUBDIR += pgagent
     SUBDIR += pgbouncer
     SUBDIR += pgdbf
     SUBDIR += pgfouine
diff --git a/databases/pgagent/Makefile b/databases/pgagent/Makefile
new file mode 100644
index 000000000000..5025c9a94921
--- /dev/null
+++ b/databases/pgagent/Makefile
@@ -0,0 +1,26 @@
+# New ports collection makefile for:    pgagent
+# Date created:                         June 8, 2012
+# Whom:                                 Max Khon
+#
+# $FreeBSD$
+#
+
+PORTNAME=	pgagent
+PORTVERSION=	3.2.1
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_PGSQL}
+MASTER_SITE_SUBDIR=	pgadmin3/release/pgagent
+DISTNAME=	pgAgent-${PORTVERSION}-Source
+
+MAINTAINER=	fjoe@FreeBSD.org
+COMMENT=	Job scheduler for PostgreSQL
+
+MAKE_JOBS_SAFE=	yes
+USE_CMAKE=	yes
+CMAKE_ARGS=	-DSTATIC_BUILD:BOOL=NO -DWX_CONFIG_PATH:FILEPATH="${WX_CONFIG}"
+USE_WX=		2.8
+WX_UNICODE=	yes
+USE_PGSQL=	yes
+IGNORE_WITH_PGSQL=	82 83
+
+.include <bsd.port.mk>
diff --git a/databases/pgagent/distinfo b/databases/pgagent/distinfo
new file mode 100644
index 000000000000..1e63cc3d0189
--- /dev/null
+++ b/databases/pgagent/distinfo
@@ -0,0 +1,2 @@
+SHA256 (pgAgent-3.2.1-Source.tar.gz) = 7264bdc5d5609d36aab814e3b329e10a87c0699274412a979b27a711f983f365
+SIZE (pgAgent-3.2.1-Source.tar.gz) = 42722
diff --git a/databases/pgagent/files/patch-CMakeLists.txt b/databases/pgagent/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..03107aab44d4
--- /dev/null
+++ b/databases/pgagent/files/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+--- CMakeLists.txt.orig	2012-04-18 18:16:55.000000000 +0700
++++ CMakeLists.txt	2012-06-08 14:51:19.000000000 +0700
+@@ -133,12 +133,12 @@
+     INSTALL(FILES ${pgagent_SOURCE_DIR}/pgagent_upgrade.sql DESTINATION .)
+ ELSE(WIN32)
+     INSTALL(TARGETS pgagent DESTINATION bin)
+-    INSTALL(FILES ${pgagent_SOURCE_DIR}/pgagent.sql DESTINATION share)
+-    INSTALL(FILES ${pgagent_SOURCE_DIR}/pgagent_upgrade.sql DESTINATION share)
++    INSTALL(FILES ${pgagent_SOURCE_DIR}/pgagent.sql DESTINATION share/pgagent)
++    INSTALL(FILES ${pgagent_SOURCE_DIR}/pgagent_upgrade.sql DESTINATION share/pgagent)
+ ENDIF(WIN32)
+ 
+-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
+-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
++INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION share/pgagent)
++INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION share/pgagent)
+ 
+ ################################################################################
+ # pgaevent
diff --git a/databases/pgagent/pkg-descr b/databases/pgagent/pkg-descr
new file mode 100644
index 000000000000..b311a4ed6da6
--- /dev/null
+++ b/databases/pgagent/pkg-descr
@@ -0,0 +1,3 @@
+pgAgent is a job scheduler for PostgreSQL which may be managed using pgAdmin.
+
+WWW:	http://www.pgadmin.org/download/pgagent.php
diff --git a/databases/pgagent/pkg-plist b/databases/pgagent/pkg-plist
new file mode 100644
index 000000000000..832551793e58
--- /dev/null
+++ b/databases/pgagent/pkg-plist
@@ -0,0 +1,6 @@
+bin/pgagent
+%%DATADIR%%/LICENSE
+%%DATADIR%%/README
+%%DATADIR%%/pgagent.sql
+%%DATADIR%%/pgagent_upgrade.sql
+@dirrm %%DATADIR%%