diff --git a/net/py-s3cmd/Makefile b/net/py-s3cmd/Makefile
index 4e80fa9b3a56..d03152f7f61f 100644
--- a/net/py-s3cmd/Makefile
+++ b/net/py-s3cmd/Makefile
@@ -2,17 +2,17 @@
 # $FreeBSD$
 
 PORTNAME=	s3cmd
-PORTVERSION=	1.0.1
-PORTREVISION=	1
+DISTVERSION=	1.5.0-rc1
 CATEGORIES=	net python
-MASTER_SITES=	SF/s3tools/${PORTNAME}/${PORTVERSION}
+MASTER_SITES=	SF/s3tools/${PORTNAME}/${DISTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Unix-like tools to manipulate stored files from the command line
 
-USE_PYDISTUTILS=	yes
 USE_PYTHON=	2
+USE_PYDISTUTILS=	yes
+PYDISTUTILS_AUTOPLIST=	yes
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/net/py-s3cmd/distinfo b/net/py-s3cmd/distinfo
index e4a88fd8d863..62056450cef1 100644
--- a/net/py-s3cmd/distinfo
+++ b/net/py-s3cmd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (s3cmd-1.0.1.tar.gz) = d76826ea9c5a4789044424f1a50abe83523ba5d12a9185c7a6b7f4c86984bdce
-SIZE (s3cmd-1.0.1.tar.gz) = 57594
+SHA256 (s3cmd-1.5.0-rc1.tar.gz) = 90d5f5beb34250b0bb64a6773a61b036773058ec1ffdc33aa21a3e6a25d7a33f
+SIZE (s3cmd-1.5.0-rc1.tar.gz) = 86414
diff --git a/net/py-s3cmd/pkg-plist b/net/py-s3cmd/pkg-plist
deleted file mode 100644
index 6dc209604ec7..000000000000
--- a/net/py-s3cmd/pkg-plist
+++ /dev/null
@@ -1,49 +0,0 @@
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PYTHON_SITELIBDIR%%/S3/ACL.py
-%%PYTHON_SITELIBDIR%%/S3/ACL.pyc
-%%PYTHON_SITELIBDIR%%/S3/ACL.pyo
-%%PYTHON_SITELIBDIR%%/S3/AccessLog.py
-%%PYTHON_SITELIBDIR%%/S3/AccessLog.pyc
-%%PYTHON_SITELIBDIR%%/S3/AccessLog.pyo
-%%PYTHON_SITELIBDIR%%/S3/BidirMap.py
-%%PYTHON_SITELIBDIR%%/S3/BidirMap.pyc
-%%PYTHON_SITELIBDIR%%/S3/BidirMap.pyo
-%%PYTHON_SITELIBDIR%%/S3/CloudFront.py
-%%PYTHON_SITELIBDIR%%/S3/CloudFront.pyc
-%%PYTHON_SITELIBDIR%%/S3/CloudFront.pyo
-%%PYTHON_SITELIBDIR%%/S3/Config.py
-%%PYTHON_SITELIBDIR%%/S3/Config.pyc
-%%PYTHON_SITELIBDIR%%/S3/Config.pyo
-%%PYTHON_SITELIBDIR%%/S3/Exceptions.py
-%%PYTHON_SITELIBDIR%%/S3/Exceptions.pyc
-%%PYTHON_SITELIBDIR%%/S3/Exceptions.pyo
-%%PYTHON_SITELIBDIR%%/S3/PkgInfo.py
-%%PYTHON_SITELIBDIR%%/S3/PkgInfo.pyc
-%%PYTHON_SITELIBDIR%%/S3/PkgInfo.pyo
-%%PYTHON_SITELIBDIR%%/S3/Progress.py
-%%PYTHON_SITELIBDIR%%/S3/Progress.pyc
-%%PYTHON_SITELIBDIR%%/S3/Progress.pyo
-%%PYTHON_SITELIBDIR%%/S3/S3.py
-%%PYTHON_SITELIBDIR%%/S3/S3.pyc
-%%PYTHON_SITELIBDIR%%/S3/S3.pyo
-%%PYTHON_SITELIBDIR%%/S3/S3Uri.py
-%%PYTHON_SITELIBDIR%%/S3/S3Uri.pyc
-%%PYTHON_SITELIBDIR%%/S3/S3Uri.pyo
-%%PYTHON_SITELIBDIR%%/S3/SimpleDB.py
-%%PYTHON_SITELIBDIR%%/S3/SimpleDB.pyc
-%%PYTHON_SITELIBDIR%%/S3/SimpleDB.pyo
-%%PYTHON_SITELIBDIR%%/S3/SortedDict.py
-%%PYTHON_SITELIBDIR%%/S3/SortedDict.pyc
-%%PYTHON_SITELIBDIR%%/S3/SortedDict.pyo
-%%PYTHON_SITELIBDIR%%/S3/Utils.py
-%%PYTHON_SITELIBDIR%%/S3/Utils.pyc
-%%PYTHON_SITELIBDIR%%/S3/Utils.pyo
-%%PYTHON_SITELIBDIR%%/S3/__init__.py
-%%PYTHON_SITELIBDIR%%/S3/__init__.pyc
-%%PYTHON_SITELIBDIR%%/S3/__init__.pyo
-bin/s3cmd
-man/man1/s3cmd.1.gz
-@dirrmtry %%PYTHON_SITELIBDIR%%/S3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%