diff --git a/cryptography/Pkgfile b/cryptography/Pkgfile
deleted file mode 100644
index 241dab8b4..000000000
--- a/cryptography/Pkgfile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Description: A package designed to expose cryptographic recipes and primitives to Python developers.
-# URL: http://pypi.python.org/pypi/cryptography
-# Maintainer: Danny Rawlins, crux at romster dot me
-# Packager: Danny Rawlins, crux at romster dot me
-# Depends on: six cffi enum34 pyasn1
-
-name=cryptography
-version=1.6
-release=1
-source=(https://pypi.python.org/packages/d7/a2/b90736c37fd720db425c5e48d69da75a6eff6609b22d2123762f1ae8c5f5/$name-$version.tar.gz)
-
-build() {
-	cd $name-$version
-
-	/usr/bin/python setup.py build
-	/usr/bin/python setup.py install --root=$PKG --optimize=1
-}
diff --git a/cryptography/.footprint b/python-cryptography/.footprint
similarity index 100%
rename from cryptography/.footprint
rename to python-cryptography/.footprint
diff --git a/cryptography/.md5sum b/python-cryptography/.md5sum
similarity index 100%
rename from cryptography/.md5sum
rename to python-cryptography/.md5sum
diff --git a/cryptography/.signature b/python-cryptography/.signature
similarity index 56%
rename from cryptography/.signature
rename to python-cryptography/.signature
index 333918d62..0f8c806c1 100644
--- a/cryptography/.signature
+++ b/python-cryptography/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF31fNuPmTUTqJR+eJWiSrYlSSwljvhdGIjd0E48/Kl31sGQo8j3kMdnwsy9vk2EtvuHZ5BD8TGORBLtjpiJR0sQk=
-SHA256 (Pkgfile) = 4d29837dff1242b41ebd9cd99625f7fc314a05f256c7b06a04dff7e437781491
+RWSagIOpLGJF3zfodtyYVtumbsiyIuu8UDDRB+HDceyEXtiqJ7a2W/VUxYNNkQWfev6ThRomGfMhf3dOdLHmjXpXd3UiEYCbFgI=
+SHA256 (Pkgfile) = 0bfb13421e5966091fb307b15e2c8bf6e7cd678a441cb38fd67fd47c1365984d
 SHA256 (.footprint) = e71ae1df35a2af2ac2880c07952cda2a64c972ed98a3dc7e0a207bf72110ef54
 SHA256 (cryptography-1.6.tar.gz) = 4d0d86d2c8d3fc89133c3fa0d164a688a458b6663ab6fa965c80d6c2cdaf9b3f
diff --git a/python-cryptography/Pkgfile b/python-cryptography/Pkgfile
new file mode 100644
index 000000000..0a794e11d
--- /dev/null
+++ b/python-cryptography/Pkgfile
@@ -0,0 +1,15 @@
+# Description: A package designed to expose cryptographic recipes and primitives to Python developers.
+# URL: http://pypi.python.org/pypi/cryptography
+# Maintainer: Danny Rawlins, crux at romster dot me
+# Depends on: enum34 pyasn1 python-cffi
+
+name=python-cryptography
+version=1.6
+release=1
+source=(https://files.pythonhosted.org/packages/source/${name:7:1}/${name#*-}/${name#*-}-$version.tar.gz)
+
+build() {
+	cd ${name#*-}-$version
+	/usr/bin/python setup.py build
+	/usr/bin/python setup.py install --prefix=/usr --root=$PKG --optimize=1
+}