diff --git a/hpp-environments/Makefile b/hpp-environments/Makefile
index e532ef7a1b2402cffd226eab45b6a23c7d8320ad..99e841505bc7433c5ac815a4a3a7552af5f034e9 100644
--- a/hpp-environments/Makefile
+++ b/hpp-environments/Makefile
@@ -5,11 +5,10 @@
 HPP_PACKAGE=	hpp-environments
 HPP_COMMENT=	Environments and robot descriptions for HPP
 HPP_VERSION=	4.4.0
+PKGREVISION=	1
 
 CATEGORIES=	wip
 
-DEPEND_ABI.python+=	python<3
-
 include ../../meta-pkgs/hpp/Makefile.common
 
 include ../../mk/sysdep/python.mk
diff --git a/hpp-environments/PLIST b/hpp-environments/PLIST
index 822836208d9ef6320c05154e9b301bfec37022f5..c778ac2e1d6ec7a7f0011bf3d54d7d63d11c3c91 100644
--- a/hpp-environments/PLIST
+++ b/hpp-environments/PLIST
@@ -4,7 +4,9 @@ include/hpp/environments/deprecated.hh
 include/hpp/environments/warning.hh
 lib/pkgconfig/hpp-environments.pc
 ${PYTHON_SITELIB}/hpp/environments/__init__.py
+${PYTHON_SITELIB}/hpp/environments/__init__.pyc
 ${PYTHON_SITELIB}/hpp/environments/robot.py
+${PYTHON_SITELIB}/hpp/environments/robot.pyc
 share/hpp_environments/meshes/CMakeLists.txt
 share/hpp_environments/meshes/buggy/buggy.dae
 share/hpp_environments/meshes/buggy/buggyBB.dae
diff --git a/hpp-environments/distinfo b/hpp-environments/distinfo
index f1ae7ddfa93a8ef3829d9ce2e12cb2fc87e891dd..12d93be13de0652e1f96886c5724e97f0286d794 100644
--- a/hpp-environments/distinfo
+++ b/hpp-environments/distinfo
@@ -1,3 +1,4 @@
 SHA1 (hpp-environments-4.4.0.tar.gz) = 4837ed1b1fb064b8edf4ec6b51994c687ad305ba
 RMD160 (hpp-environments-4.4.0.tar.gz) = 1fa323b9397f5fe3be7c0eb10e56a4a50b72d1de
 Size (hpp-environments-4.4.0.tar.gz) = 5759899 bytes
+SHA1 (patch-aa) = f1e11736b8cc41791d13786e94b0f3272d590a9d
diff --git a/hpp-environments/patches/patch-aa b/hpp-environments/patches/patch-aa
new file mode 100644
index 0000000000000000000000000000000000000000..b1cacdcb1efd2deae82d5b056b1148aa2199eaaf
--- /dev/null
+++ b/hpp-environments/patches/patch-aa
@@ -0,0 +1,16 @@
+--- src/hpp/environments/__init__.py.orig	2019-02-11 12:56:51.000000000 +0100
++++ src/hpp/environments/__init__.py	2019-08-22 13:32:38.074742112 +0200
+@@ -1 +1 @@
+-from robot import Buggy
++from .robot import Buggy
+--- CMakeLists.txt.orig	2019-02-11 12:56:51.000000000 +0100
++++ CMakeLists.txt	2019-08-22 13:32:24.554859622 +0200
+@@ -25,7 +25,7 @@
+ 
+ SETUP_HPP_PROJECT()
+ 
+-FINDPYTHON(2.7 EXACT REQUIRED)
++FINDPYTHON(REQUIRED)
+ 
+ SET(TEXTURE_FILES
+   texture/logo_romeo.jpg