diff --git a/morse-pocolibs/Makefile b/morse-pocolibs/Makefile
index 9111da9a3e884f4f89e0007fa32854e11b5bd665..4226be7c5494cc07dce54e9f830ab106a7f4a522 100644
--- a/morse-pocolibs/Makefile
+++ b/morse-pocolibs/Makefile
@@ -52,5 +52,5 @@ define PKG_OPTION_SET.hri
 endef
 
 include ../../simulation/morse/depend.mk
-include ../../mk/sysdep/swig.mk
+include ../../devel/swig/depend.mk
 include ../../mk/robotpkg.mk
diff --git a/morse-pocolibs/depend.mk b/morse-pocolibs/depend.mk
index 72e59aca3cffea70856882e987cf1ce113d98eab..58897563470cc7ab12f3e8d246396027be1155c9 100644
--- a/morse-pocolibs/depend.mk
+++ b/morse-pocolibs/depend.mk
@@ -19,10 +19,9 @@ DEPEND_ABI.morse-pocolibs?=	morse-pocolibs>=0.2
 DEPEND_DIR.morse-pocolibs?=	../../wip/morse-pocolibs
 
 SYSTEM_SEARCH.morse-pocolibs=\
-	${PYTHON_SITELIB}/morse/middleware/pocolibs_mw.py
+	lib/python*/{site,dist}-packages/morse/middleware/pocolibs_mw.py
 
-DEPEND_METHOD.python3+=		bootstrap
-include ../../lang/python3/depend.mk
+include ../../mk/sysdep/python.mk
 
 endif # MORSE_POCOLIBS_DEPEND_MK -------------------------------------------