diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index dc0a621f091e..680365d2e84f 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -6,12 +6,15 @@
 #
 
 PORTNAME=	readline
-PORTVERSION=	5.0
+PORTVERSION=	5.1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.cwru.edu/pub/bash/
+MASTER_SITES=	${MASTER_SITE_GNU} \
+		ftp://ftp.cwru.edu/pub/bash/
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-PATCH_SITES=	ftp://ftp.cwru.edu/pub/bash/${PORTNAME}-${PORTVERSION}-patches/
-PATCHFILES=	readline50-001 readline50-002 readline50-003 readline50-004 readline50-005
+PATCH_SITES=	ftp://ftp.gnu.org/gnu/readline/${PORTNAME}-${PORTVERSION}-patches/ \
+		ftp://ftp.cwru.edu/pub/bash/${PORTNAME}-${PORTVERSION}-patches/
+PATCHFILES=	readline51-001
 
 MAINTAINER=	laszlof@vonostingroup.com
 COMMENT=	A library for editing command lines as they are typed
diff --git a/devel/readline/distinfo b/devel/readline/distinfo
index a2c6abc4b689..38a953adbb10 100644
--- a/devel/readline/distinfo
+++ b/devel/readline/distinfo
@@ -1,18 +1,6 @@
-MD5 (readline-5.0.tar.gz) = 9a39d15f1ed592883f8c6671e8c13120
-SHA256 (readline-5.0.tar.gz) = d19e4f820da653b94262b0e5cdeda45f474c2d7b378a85a4b9aeaae76269a611
-SIZE (readline-5.0.tar.gz) = 1808946
-MD5 (readline50-001) = 5b47ed61b6b8413746750127c70e843d
-SHA256 (readline50-001) = b1becd30aade01def4fd8dbcb6749dc2db85c9de90d3acdeb8f9270a43dfa23b
-SIZE (readline50-001) = 1702
-MD5 (readline50-002) = 9f803005e7e4c7d675146a9a805acbf1
-SHA256 (readline50-002) = 662d39296e66562300b34ad5ab8c2eb76d6f95e665e76752abf9e9a27aa13109
-SIZE (readline50-002) = 1337
-MD5 (readline50-003) = 05d59c91f80fa99ab177783229b0f769
-SHA256 (readline50-003) = 12f9d8942eee8f77f42887b4fd5035277bddb28d7820719edd597ea9bcbe0e3d
-SIZE (readline50-003) = 3841
-MD5 (readline50-004) = aa1f6343e47f8e024488c63281d77809
-SHA256 (readline50-004) = d0f8606fa007ef938e236635c8b75b243f66ad400dd907b194b70a09b4834c27
-SIZE (readline50-004) = 2411
-MD5 (readline50-005) = 1dc2654e0161f2e7b4f536b12e1d54b7
-SHA256 (readline50-005) = 9110c75530ee3e249139f7896bf46cc7d20f4d2889f03dcc2a01df49dc9efe83
-SIZE (readline50-005) = 2216
+MD5 (readline-5.1.tar.gz) = 7ee5a692db88b30ca48927a13fd60e46
+SHA256 (readline-5.1.tar.gz) = 163ec6407ec75a709c9077657b1fca9314cc74999d57d1c35ab185702bb067c6
+SIZE (readline-5.1.tar.gz) = 2030276
+MD5 (readline51-001) = 63faf622820ca0828131c8b5aeac1e6a
+SHA256 (readline51-001) = 2c9786b231a454504c3f38361af6fd74e61789bc1009eba5fb2447b5a3ac5774
+SIZE (readline51-001) = 2042