diff --git a/devel/py-pydoop/Makefile b/devel/py-pydoop/Makefile
index 3b228628bc52..a667f647c60b 100644
--- a/devel/py-pydoop/Makefile
+++ b/devel/py-pydoop/Makefile
@@ -14,8 +14,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
 RUN_DEPENDS=	${LOCALBASE}/bin/yarn:${PORTSDIR}/devel/hadoop2
 
 USES=		python:2
-USE_PYTHON=	distutils
+USE_PYTHON=	distutils autoplist
 USE_JAVA=	1.7
-MAKE_ENV+=	HADOOP_HOME=${LOCALBASE}
+MAKE_ENV+=	HADOOP_HOME=${LOCALBASE} \
+		JAVA_HOME=${JAVA_HOME}
 
 .include <bsd.port.mk>
diff --git a/devel/py-pydoop/pkg-plist b/devel/py-pydoop/pkg-plist
index 9ea3b255ff87..189ca0227a6a 100644
--- a/devel/py-pydoop/pkg-plist
+++ b/devel/py-pydoop/pkg-plist
@@ -1,144 +1,2 @@
-bin/pydoop
-%%PYTHON_SITELIBDIR%%/pydoop/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/argparse_types.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/argparse_types.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/argparse_types.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/main.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/main.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/main.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/script.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/script.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/script.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/script_template.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/script_template.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/script_template.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/app/submit.py
-%%PYTHON_SITELIBDIR%%/pydoop/app/submit.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/app/submit.pyo
 %%PYTHON_SITELIBDIR%%/pydoop/avro-mapred-1.7.4-hadoop2.jar
-%%PYTHON_SITELIBDIR%%/pydoop/avrolib.py
-%%PYTHON_SITELIBDIR%%/pydoop/avrolib.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/avrolib.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/config.py
-%%PYTHON_SITELIBDIR%%/pydoop/config.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/config.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hadoop_utils.py
-%%PYTHON_SITELIBDIR%%/pydoop/hadoop_utils.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hadoop_utils.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hadut.py
-%%PYTHON_SITELIBDIR%%/pydoop/hadut.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hadut.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/common.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/common.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/common.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/api.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/api.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/api.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/common.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/common.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/common.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/hadoop.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/hadoop.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/bridged/hadoop.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/impl.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/impl.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/core/impl.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/file.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/file.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/file.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/fs.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/fs.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/fs.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/path.py
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/path.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/hdfs/path.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/jc.py
-%%PYTHON_SITELIBDIR%%/pydoop/jc.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/jc.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/api.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/api.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/api.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/binary_streams.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/binary_streams.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/binary_streams.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/connections.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/connections.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/connections.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/jwritable_utils.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/jwritable_utils.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/jwritable_utils.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/pipes.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/pipes.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/pipes.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/simulator.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/simulator.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/simulator.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/streams.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/streams.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/streams.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/string_utils.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/string_utils.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/string_utils.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/text_streams.py
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/text_streams.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/mapreduce/text_streams.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/native_core_hdfs.so
-%%PYTHON_SITELIBDIR%%/pydoop/pipes.py
-%%PYTHON_SITELIBDIR%%/pydoop/pipes.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/pipes.pyo
 %%PYTHON_SITELIBDIR%%/pydoop/pydoop.jar
-%%PYTHON_SITELIBDIR%%/pydoop/pydoop.properties
-%%PYTHON_SITELIBDIR%%/pydoop/sercore.so
-%%PYTHON_SITELIBDIR%%/pydoop/test_support.py
-%%PYTHON_SITELIBDIR%%/pydoop/test_support.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/test_support.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/test_utils.py
-%%PYTHON_SITELIBDIR%%/pydoop/test_utils.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/test_utils.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/__init__.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/factory.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/factory.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/factory.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/jpype_loader.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/jpype_loader.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/jpype_loader.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/pyjnius_loader.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/pyjnius_loader.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/bridge/pyjnius_loader.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/conversion_tables.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/conversion_tables.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/conversion_tables.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/jvm.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/jvm.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/jvm.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/misc.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/misc.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/misc.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/utils/serialize.py
-%%PYTHON_SITELIBDIR%%/pydoop/utils/serialize.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/utils/serialize.pyo
-%%PYTHON_SITELIBDIR%%/pydoop/version.py
-%%PYTHON_SITELIBDIR%%/pydoop/version.pyc
-%%PYTHON_SITELIBDIR%%/pydoop/version.pyo