diff --git a/pkgtools/pkg_online-client/DESCR b/pkgtools/pkg_online-client/DESCR
new file mode 100644
index 000000000000..c9acd2ebe1e0
--- /dev/null
+++ b/pkgtools/pkg_online-client/DESCR
@@ -0,0 +1,2 @@
+
+This package provides client tools of PKG_ONLINE.
diff --git a/pkgtools/pkg_online-client/Makefile b/pkgtools/pkg_online-client/Makefile
new file mode 100644
index 000000000000..f03362f13f55
--- /dev/null
+++ b/pkgtools/pkg_online-client/Makefile
@@ -0,0 +1,32 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/05/16 19:16:49 cheusov Exp $
+#
+
+.include "../../pkgtools/pkg_online-server/Makefile.common"
+
+PKGNAME=	${DISTNAME:C/online/online-client/}
+CATEGORIES=	pkgtools
+MAINTAINER=	cheusov@tut.by
+COMMENT+=	(client tools)
+
+DEPENDS+=	dict-client>=1.10.9:../../textproc/dict-client
+DEPENDS+=	pkg_summary-utils>=0.49:../../pkgtools/pkg_summary-utils
+DEPENDS+=	pipestatus-[0-9]*:../../devel/pipestatus
+DEPENDS+=	netcat-[0-9]*:../../net/netcat
+
+BUILD_DEPENDS+=	mk-configure>=0.20.0:../../devel/mk-configure
+
+INSTALL_TARGET=	install-client install-doc
+
+DESCR_SRC+=	${.CURDIR}/DESCR
+
+DOCDIR=		${PREFIX}/share/doc/pkg_online-client
+EGDIR=		${PREFIX}/share/examples/pkg_online-client
+
+MAKE_ENV+=	DOCDIR=${DOCDIR} EGDIR=${EGDIR}
+
+CONF_FILES=	${EGDIR}/pkg_online_client.conf \
+		${PKG_SYSCONFDIR}/pkg_online_client.conf
+
+MAKE_PROGRAM=	mkcmake
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_online-client/PLIST b/pkgtools/pkg_online-client/PLIST
new file mode 100644
index 000000000000..0fb90741514a
--- /dev/null
+++ b/pkgtools/pkg_online-client/PLIST
@@ -0,0 +1,8 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/16 19:16:49 cheusov Exp $
+bin/pkg_online_client
+bin/pkg_online_client.env
+bin/pkg_online_find
+share/doc/pkg_online-client/NEWS
+share/doc/pkg_online-client/README
+share/doc/pkg_online-client/TODO
+share/examples/pkg_online-client/pkg_online_client.conf
diff --git a/pkgtools/pkg_online-server/DESCR b/pkgtools/pkg_online-server/DESCR
new file mode 100644
index 000000000000..781ddb1b4b5e
--- /dev/null
+++ b/pkgtools/pkg_online-server/DESCR
@@ -0,0 +1,2 @@
+
+This package provides tools for builidng PKG_ONLINE databases
diff --git a/pkgtools/pkg_online-server/DESCR.common b/pkgtools/pkg_online-server/DESCR.common
new file mode 100644
index 000000000000..cde21aaeb42c
--- /dev/null
+++ b/pkgtools/pkg_online-server/DESCR.common
@@ -0,0 +1,18 @@
+pkg_online - client/server package searcher for pkgsrc.
+
+Every separate field (PKGPATH, PKGNAME, COMMENT etc.) may be queried
+separately and multiple fields may be queried too. A lot of search
+strategies are available. Set of fields and search strategies may
+very depending on your server configuration. Search in multiple
+"repositories" is supported too, e.g. search in binary repository
+or in pkgsrc source tree.
+
+Communication protocol is a well known dictionary protocol described
+in RFC-2229. Server may run dictd or any other dictionary protocol
+server.  For dictd see http://www.dict.org and
+http://sourceforge.net/projects/dict
+
+pkg_online has minimal amount of things specific to pkgsrc and can
+easily be adapted to any other packageing systems.
+
+Of course it is based on pkg_summary-utils ;-)
diff --git a/pkgtools/pkg_online-server/Makefile b/pkgtools/pkg_online-server/Makefile
new file mode 100644
index 000000000000..32eff9ec05cf
--- /dev/null
+++ b/pkgtools/pkg_online-server/Makefile
@@ -0,0 +1,31 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/05/16 19:16:22 cheusov Exp $
+#
+
+.include "../../pkgtools/pkg_online-server/Makefile.common"
+
+PKGNAME=	${DISTNAME:C/online/online-server/}
+CATEGORIES=	pkgtools
+MAINTAINER=	cheusov@tut.by
+COMMENT+=	(server tools)
+
+DEPENDS+=	dict-server>=1.10.10nb2:../../textproc/dict-server
+DEPENDS+=	pkg_summary-utils>=0.18.1:../../pkgtools/pkg_summary-utils
+DEPENDS+=	pipestatus-[0-9]*:../../devel/pipestatus
+
+BUILD_DEPENDS+=	mk-configure>=0.20.0:../../devel/mk-configure
+
+INSTALL_TARGET=	install-server install-doc
+
+DESCR_SRC+=	${.CURDIR}/DESCR
+
+DOCDIR=		${PREFIX}/share/doc/pkg_online-server
+EGDIR=		${PREFIX}/share/examples/pkg_online-server
+
+MAKE_ENV+=	DOCDIR=${DOCDIR} EGDIR=${EGDIR}
+
+CONF_FILES=	${EGDIR}/pkg_online_server.conf \
+		${PKG_SYSCONFDIR}/pkg_online_server.conf
+
+MAKE_PROGRAM=	mkcmake
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/pkgtools/pkg_online-server/Makefile.common b/pkgtools/pkg_online-server/Makefile.common
new file mode 100644
index 000000000000..904a27a3bf12
--- /dev/null
+++ b/pkgtools/pkg_online-server/Makefile.common
@@ -0,0 +1,21 @@
+# $NetBSD: Makefile.common,v 1.1.1.1 2011/05/16 19:16:22 cheusov Exp $
+#
+# used by pkgtools/pkg_online-client/Makefile
+# used by pkgtools/pkg_online-server/Makefile
+
+DISTNAME=	pkg_online-${VERSION}
+MASTER_SITES=	http://mova.org/~cheusov/pub/pkg_online/
+
+VERSION=	0.12.1
+
+HOMEPAGE=	http://mova.org/~cheusov/pub/pkg_online/
+COMMENT=	Client/Server package searcher for pkgsrc
+
+LICENSE=		mit
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+DISTINFO_FILE=		${.CURDIR}/../../pkgtools/pkg_online-server/distinfo
+DESCR_SRC=		${.CURDIR}/../../pkgtools/pkg_online-server/DESCR.common
+
+USE_LANGUAGES=		# none
diff --git a/pkgtools/pkg_online-server/PLIST b/pkgtools/pkg_online-server/PLIST
new file mode 100644
index 000000000000..16faa156470b
--- /dev/null
+++ b/pkgtools/pkg_online-server/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/05/16 19:16:22 cheusov Exp $
+bin/pkg_online_mkconf
+bin/pkg_online_server.env
+bin/pkg_summary2all
+bin/pkg_summary2dict
+bin/pkg_summary2field-index
+bin/pkg_summary2info
+bin/pkg_summary2onelineinfo
+bin/pkg_summary2shortinfo
+share/doc/pkg_online-server/NEWS
+share/doc/pkg_online-server/README
+share/doc/pkg_online-server/TODO
+share/examples/pkg_online-server/dictd.conf
+share/examples/pkg_online-server/pkg_online_server.conf
diff --git a/pkgtools/pkg_online-server/distinfo b/pkgtools/pkg_online-server/distinfo
new file mode 100644
index 000000000000..69f325103d5d
--- /dev/null
+++ b/pkgtools/pkg_online-server/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/05/16 19:16:22 cheusov Exp $
+
+SHA1 (pkg_online-0.12.1.tar.gz) = 829b26a12f8b48c4b238a4f50625cf9ee3dc4feb
+RMD160 (pkg_online-0.12.1.tar.gz) = a1d1bfce9f5e45dc3b3658b9d401744ac4f297bb
+Size (pkg_online-0.12.1.tar.gz) = 15175 bytes