diff --git a/app-crypt/af_alg/Manifest b/app-crypt/af_alg/Manifest
index da2c017ffb214..9d76d521cbe45 100644
--- a/app-crypt/af_alg/Manifest
+++ b/app-crypt/af_alg/Manifest
@@ -1 +1,2 @@
+DIST af_alg-0.0.1.tar.gz 332007 SHA256 aeeef47027b06208207553ffc477758d6d4b8334c26b2b233af5127ef7e0a5d9 SHA512 10860268dbff65e20d78c7d251b5ac4e63342e01c30af72894baa63a625f11900a77a8d0cca29d93bd3a06ae29c16c5fc4d71843e7379b7d948ad1b6e6b58b5b WHIRLPOOL 86abc4aba4977f0c0ac83a07f7f4dff250445d6cfc7dc6112bb97f290711d3a16b7ccfb29da5b553cfe5eba08b42d0d333da92afe53fd99ce27f4eda78c35434
 DIST af_alg-7b13512edbd77c35d20edb4e53d5d83eeaf05d52.tar.gz 5362 SHA256 5fd78ccf5f815ac89d55bf53db6a41a720100325e2ecb7dd7c2b459d30bee88d SHA512 c897a64ce12c5ecbdf8147a8776b646b9fed7d012cbc913e1f047eff4dd81fe1783733d64e711ab3702923b57055e4ca923cdf4f90bef6a4868f803be11239ca WHIRLPOOL 53c1972c01833f7a4151f1613095a53a5fe46ed162296c2a082b1c647e038c1367c70a3dfdb4399e3ce2244d7b3a544614805e0f40a69b63ae2cb996d7dd3d61
diff --git a/app-crypt/openssl-af_alg-engine/openssl-af_alg-engine-0.0.1.ebuild b/app-crypt/af_alg/af_alg-0.0.1.ebuild
similarity index 100%
rename from app-crypt/openssl-af_alg-engine/openssl-af_alg-engine-0.0.1.ebuild
rename to app-crypt/af_alg/af_alg-0.0.1.ebuild
diff --git a/app-crypt/af_alg/metadata.xml b/app-crypt/af_alg/metadata.xml
index 435ff298aa21e..311413031703f 100644
--- a/app-crypt/af_alg/metadata.xml
+++ b/app-crypt/af_alg/metadata.xml
@@ -2,15 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
+	<email>nerdboy@gentoo.org</email>
+	<name>Stephen Arnold</name>
 </maintainer>
 <longdescription lang="en">
 af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found in
 kernel &gt;= 2.6.38 for crypto offload. Be sure to actually check if it's faster,
 as for many modern systems, userspace software implementations are actually
 faster, as they avoid a kernel context switch. However, on embedded systems and
-others with crypto hardware, AF_ALG may be faster.  The homepage has more
+others with crypto hardware, AF_ALG may be faster.  The upstream readme has more
 details.
 </longdescription>
+<upstream>
+	<remote-id type="github">sarnold/af_alg</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/app-crypt/openssl-af_alg-engine/Manifest b/app-crypt/openssl-af_alg-engine/Manifest
deleted file mode 100644
index 360d3b539c2ba..0000000000000
--- a/app-crypt/openssl-af_alg-engine/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST af_alg-0.0.1.tar.gz 332007 SHA256 aeeef47027b06208207553ffc477758d6d4b8334c26b2b233af5127ef7e0a5d9 SHA512 10860268dbff65e20d78c7d251b5ac4e63342e01c30af72894baa63a625f11900a77a8d0cca29d93bd3a06ae29c16c5fc4d71843e7379b7d948ad1b6e6b58b5b WHIRLPOOL 86abc4aba4977f0c0ac83a07f7f4dff250445d6cfc7dc6112bb97f290711d3a16b7ccfb29da5b553cfe5eba08b42d0d333da92afe53fd99ce27f4eda78c35434
diff --git a/app-crypt/openssl-af_alg-engine/metadata.xml b/app-crypt/openssl-af_alg-engine/metadata.xml
deleted file mode 100644
index 9d4d9ca02e637..0000000000000
--- a/app-crypt/openssl-af_alg-engine/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
-</maintainer>
-<longdescription lang="en">
-af_alg implements an OpenSSL engine that uses the AF_ALG functionailty found
-in kernel &gt;= 2.6.38 for crypto offload. Be sure to actually check if it's
-faster, as for many modern systems, userspace software implementations are
-actually faster, as they avoid a kernel context switch. However, on embedded
-systems and others with crypto hardware, AF_ALG may be faster.  The homepage
-has more details.
-</longdescription>
-<upstream>
-	<remote-id type="github">sarnold/af_alg</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/profiles/updates/3Q-2016 b/profiles/updates/3Q-2016
index 54ba2c2a048eb..ed9cdd3c50cb8 100644
--- a/profiles/updates/3Q-2016
+++ b/profiles/updates/3Q-2016
@@ -1,2 +1,3 @@
 move kde-base/kactivitymanagerd kde-plasma/kactivitymanagerd
 move app-portage/cpuinfo2cpuflags app-portage/cpuid2cpuflags
+move app-crypt/openssl-af_alg-engine app-crypt/af_alg