diff --git a/www/py-flask-bcrypt/Makefile b/www/py-flask-bcrypt/Makefile
index 4a76296..90b8984 100644
--- a/www/py-flask-bcrypt/Makefile
+++ b/www/py-flask-bcrypt/Makefile
@@ -1,25 +1,20 @@
-COMMENT= Flask extension provides bcrypt hashing utilities.
+COMMENT= 	bcrypt hashing for flask
 
-MODPY_DISTV=1.0.1
+MODPY_DISTV=	1.0.1
 DISTNAME=       Flask-Bcrypt-${MODPY_DISTV}
-PKGNAME=        py-${DISTNAME}
+PKGNAME=        py-${DISTNAME:L}
 CATEGORIES=     www
 
 # BSD
 PERMIT_PACKAGE= Yes
 
-MODULES=                lang/python
+MODULES=	lang/python
+MODPY_PYBUILD=	setuptools
+MODPY_PI=	Yes
 
-MODPY_PI=               Yes
-MODPY_PYBUILD =         setuptools
+RUN_DEPENDS=	www/py-flask${MODPY_FLAVOR} \
+		security/py-bcrypt
 
-
-RUN_DEPENDS=            www/py-flask${MODPY_FLAVOR} \
-			security/py-cryptography \
-			security/py-bcrypt
-# Could also use various unported eggs, Flask-Babel, speaklater
-#TEST_DEPENDS=          devel/py-nose
-
-USE_GMAKE=              Yes
+NO_TEST= 	Yes
 
 .include <bsd.port.mk>
diff --git a/www/py-flask-bcrypt/pkg/PLIST b/www/py-flask-bcrypt/pkg/PLIST
index 219edeb..ec23f96 100644
--- a/www/py-flask-bcrypt/pkg/PLIST
+++ b/www/py-flask-bcrypt/pkg/PLIST
@@ -1,10 +1,11 @@
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/licenses/
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/licenses/LICENSE
+lib/python${MODPY_VERSION}/site-packages/flask_bcrypt-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/flask_bcrypt.py
diff --git a/www/py-flask-bcrypt/pkg/PLIST.orig b/www/py-flask-bcrypt/pkg/PLIST.orig
index 640f689..219edeb 100644
--- a/www/py-flask-bcrypt/pkg/PLIST.orig
+++ b/www/py-flask-bcrypt/pkg/PLIST.orig
@@ -1,9 +1,9 @@
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/LICENSE
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/METADATA
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/RECORD
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/WHEEL
-lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_EGG_VERSION}.dist-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/Flask_Bcrypt-${MODPY_DISTV}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}flask_bcrypt.${MODPY_PYC_MAGIC_TAG}pyc