diff --git a/pypoco/DESCR b/py-poco/DESCR
similarity index 100%
rename from pypoco/DESCR
rename to py-poco/DESCR
diff --git a/py-poco/Makefile b/py-poco/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..ed9611871298b231aa2ca03238695f89a5529d49
--- /dev/null
+++ b/py-poco/Makefile
@@ -0,0 +1,20 @@
+
+VERSION=		1.2
+PKGNAME= 		${PKGTAG.python}-poco-${VERSION}
+DISTNAME=		pypoco-${VERSION}
+
+MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=pypoco/}
+MASTER_REPOSITORY=	git http://trac.laas.fr/git/robots/pypoco.git
+
+CATEGORIES=	wip
+LICENSE=	isc
+MAINTAINER=	openrobots@laas.fr
+COMMENT=	Python bindings for tclServ protocol
+
+DEPEND_ABI.python+=	python<3
+PYDISTUTILSPKG= 	ON
+
+include ../../mk/sysdep/python.mk
+
+include ../../mk/robotpkg.mk
+
diff --git a/pypoco/PLIST b/py-poco/PLIST
similarity index 100%
rename from pypoco/PLIST
rename to py-poco/PLIST
diff --git a/py-poco/depend.mk b/py-poco/depend.mk
new file mode 100644
index 0000000000000000000000000000000000000000..6298e7f70fbed958558d62e7a9a0e700593f2a56
--- /dev/null
+++ b/py-poco/depend.mk
@@ -0,0 +1,24 @@
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH}+
+PYPOCO_DEPEND_MK:=	${PYPOCO_DEPEND_MK}+
+
+ifeq (+,$(DEPEND_DEPTH))
+DEPEND_PKG+=		pypoco
+endif
+
+ifeq (+,$(PYPOCO_DEPEND_MK)) # -----------------------------------------------
+
+PREFER.pypoco?=		robotpkg
+
+DEPEND_USE+=		pypoco
+DEPEND_ABI.pypoco?=	pypoco>=1.2
+DEPEND_DIR.pypoco?=	../../wip/pypoco
+
+SYSTEM_SEARCH.pypoco=\
+	'${PYTHON_SYSLIBSEARCH}/pypoco.py'
+
+include ../../mk/sysdep/python.mk
+
+endif # PYPOCO_DEPEND_MK -----------------------------------------------------
+
+DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}
diff --git a/pypoco/distinfo b/py-poco/distinfo
similarity index 100%
rename from pypoco/distinfo
rename to py-poco/distinfo
diff --git a/pypoco/Makefile b/pypoco/Makefile
deleted file mode 100644
index 2d93fe341772e444d99dd065ccd1744fbfb74dad..0000000000000000000000000000000000000000
--- a/pypoco/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# Copyright (c) 2010 CNRS/LAAS
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-#                                          Severin Lemaignan on Tue, 25 Jan 2011
-
-
-DISTNAME=	    	pypoco-${PKGVERSION}
-PKGVERSION=	    	1.2
-
-MASTER_SITES=		${MASTER_SITE_OPENROBOTS:=pypoco/}
-MASTER_REPOSITORY=	git http://trac.laas.fr/git/robots/pypoco.git
-
-CATEGORIES=	wip
-LICENSE=	isc
-MAINTAINER=	openrobots@laas.fr
-COMMENT=	Python bindings for tclServ protocol
-
-USE_LANGUAGES+=		python
-PYTHON_REQUIRED=	>=2.5<3
-
-PYDISTUTILSPKG=		yes
-
-include ../../mk/sysdep/py-setuptools.mk
-include ../../mk/robotpkg.mk
-
diff --git a/pypoco/depend.mk b/pypoco/depend.mk
deleted file mode 100644
index dcc1c63a31a79f7c28ef8dab83ad846a58c24ad2..0000000000000000000000000000000000000000
--- a/pypoco/depend.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (c) 2010 LAAS/CNRS
-# All rights reserved.
-#
-# Redistribution  and  use in source   and binary forms,  with or without
-# modification, are permitted provided that  the following conditions are
-# met:
-#
-#   1. Redistributions  of  source code must  retain  the above copyright
-#      notice, this list of conditions and the following disclaimer.
-#   2. Redistributions in binary form must  reproduce the above copyright
-#      notice,  this list of  conditions and  the following disclaimer in
-#      the  documentation   and/or  other  materials   provided with  the
-#      distribution.
-#
-#                                        Severin Lemaignan on 25 Jan 2011
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH}+
-PYPOCO_DEPEND_MK:=	${PYPOCO_DEPEND_MK}+
-
-ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=		pypoco
-endif
-
-ifeq (+,$(PYPOCO_DEPEND_MK)) # -----------------------------------------------
-
-PREFER.pypoco?=		robotpkg
-
-DEPEND_USE+=		pypoco
-DEPEND_ABI.pypoco?=	pypoco>=1.2
-DEPEND_DIR.pypoco?=	../../wip/pypoco
-
-_pynamespec=python{2.6,2.5,2.4,[0-9].[0-9],}
-SYSTEM_SEARCH.pypoco=\
-	'lib/${_pynamespec}/{site,dist}-packages/pypoco.py'
-
-endif # PYPOCO_DEPEND_MK -----------------------------------------------------
-
-DEPEND_DEPTH:=		${DEPEND_DEPTH:+=}