diff --git a/sys-libs/readline/patches/readline-7.0.patchset b/sys-libs/readline/patches/readline-7.0.3.patchset
similarity index 100%
rename from sys-libs/readline/patches/readline-7.0.patchset
rename to sys-libs/readline/patches/readline-7.0.3.patchset
diff --git a/sys-libs/readline/readline-7.0.recipe b/sys-libs/readline/readline-7.0.3.recipe
similarity index 69%
rename from sys-libs/readline/readline-7.0.recipe
rename to sys-libs/readline/readline-7.0.3.recipe
index 25c182b6f..99e914e8d 100644
--- a/sys-libs/readline/readline-7.0.recipe
+++ b/sys-libs/readline/readline-7.0.3.recipe
@@ -10,11 +10,18 @@ The history facilites are also placed into a separate library, the History \
 library, as part of the build process. The History library may be used without \
 Readline in applications which desire its capabilities."
 HOMEPAGE="http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html"
-COPYRIGHT="1989-2016 Free Software Foundation, Inc."
+COPYRIGHT="1989-2017 Free Software Foundation, Inc."
 LICENSE="GNU GPL v3"
-REVISION="3"
-SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-$portVersion.tar.gz"
+REVISION="1"
+SOURCE_URI="ftp://ftp.gnu.org/gnu/readline/readline-7.0.tar.gz"
 CHECKSUM_SHA256="750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334"
+for i in {001..003}; do
+	eval "SOURCE_URI_$i=\"https://ftp.gnu.org/gnu/readline/readline-7.0-patches/readline70-$i#noarchive\""
+done
+CHECKSUM_SHA256_001="9ac1b3ac2ec7b1bf0709af047f2d7d2a34ccde353684e57c6b47ebca77d7a376"
+CHECKSUM_SHA256_002="8747c92c35d5db32eae99af66f17b384abaca961653e185677f9c9a571ed2d58"
+CHECKSUM_SHA256_003="9e43aa93378c7e9f7001d8174b1beb948deefa6799b6f581673f465b7d9d4780"
+SOURCE_DIR="readline-7.0"
 PATCHES="readline-$portVersion.patchset"
 
 ARCHITECTURES="x86_gcc2 x86 x86_64"
@@ -22,8 +29,8 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
 
 PROVIDES="
 	readline$secondaryArchSuffix = $portVersion compat >= 7
-	lib:libhistory$secondaryArchSuffix = $portVersion compat >= 7
-	lib:libreadline$secondaryArchSuffix = $portVersion compat >= 7
+	lib:libhistory$secondaryArchSuffix = 7.0 compat >= 7
+	lib:libreadline$secondaryArchSuffix = 7.0 compat >= 7
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -32,8 +39,8 @@ REQUIRES="
 
 PROVIDES_devel="
 	readline${secondaryArchSuffix}_devel = $portVersion
-	devel:libhistory$secondaryArchSuffix = $portVersion compat >= 7
-	devel:libreadline$secondaryArchSuffix = $portVersion compat >= 7
+	devel:libhistory$secondaryArchSuffix = 7.0 compat >= 7
+	devel:libreadline$secondaryArchSuffix = 7.0 compat >= 7
 	"
 REQUIRES_devel="
 	readline$secondaryArchSuffix == $portVersion base
@@ -57,6 +64,14 @@ defineDebugInfoPackage readline$secondaryArchSuffix \
 	$libDir/libhistory.so.7.0 \
 	$libDir/libreadline.so.7.0
 
+PATCH()
+{
+	for i in {001..003}; do
+		echo "Applying patch $i..."
+		sed -e "s/\.\.\/readline-7.0\///" ../../sources-$i/readline70-$i | patch -p0
+	done
+}
+
 BUILD()
 {
 	libtoolize --force --copy --install