diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2 b/metadata/md5-cache/net-misc/rsync-3.1.2-r1
similarity index 86%
rename from metadata/md5-cache/net-misc/rsync-3.1.2
rename to metadata/md5-cache/net-misc/rsync-3.1.2-r1
index 02bbb4b..e0454c4 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.2
+++ b/metadata/md5-cache/net-misc/rsync-3.1.2-r1
@@ -2,12 +2,12 @@
 DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
 DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=5
-HOMEPAGE=http://rsync.samba.org/
+HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
 KEYWORDS=*
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
-SRC_URI=http://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
+SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
 _eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	5d5921a298e95441da2f85be419894c0	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	21058c21ca48453d771df15500873ede	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=4f44c2367051257c9efd0faa5d0fb350
+_md5_=d52b5f3b6ee57d2e6823933643e6b75b
diff --git a/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
new file mode 100644
index 0000000..d06607c
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.2-CVE-2017-16548.patch
@@ -0,0 +1,17 @@
+X-Git-Url: https://git.samba.org/rsync.git/?p=rsync.git;a=blobdiff_plain;f=xattrs.c;h=4867e6f5b8ad2934d43b06f3b99b7b3690a6dc7a;hp=68305d7559b34f5cc2f196b74429b82fa6ff49dd;hb=47a63d90e71d3e19e0e96052bb8c6b9cb140ecc1;hpb=bc112b0e7feece62ce98708092306639a8a53cce
+
+diff --git a/xattrs.c b/xattrs.c
+index 68305d7..4867e6f 100644
+--- a/xattrs.c
++++ b/xattrs.c
+@@ -824,6 +824,10 @@ void receive_xattr(int f, struct file_struct *file)
+ 			out_of_memory("receive_xattr");
+ 		name = ptr + dget_len + extra_len;
+ 		read_buf(f, name, name_len);
++		if (name_len < 1 || name[name_len-1] != '\0') {
++			rprintf(FERROR, "Invalid xattr name received (missing trailing \\0).\n");
++			exit_cleanup(RERR_FILEIO);
++		}
+ 		if (dget_len == datum_len)
+ 			read_buf(f, ptr, dget_len);
+ 		else {
diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
similarity index 89%
rename from net-misc/rsync/rsync-3.1.2.ebuild
rename to net-misc/rsync/rsync-3.1.2-r1.ebuild
index ec6bde0..ac6837e 100644
--- a/net-misc/rsync/rsync-3.1.2.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r1.ebuild
@@ -6,9 +6,9 @@
 inherit eutils flag-o-matic prefix systemd
 
 DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="http://rsync.samba.org/"
-SRC_URI="http://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="http://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -25,10 +25,12 @@
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
+PATCHES=( "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch )
+
 S=${WORKDIR}/${P/_/}
 
 src_prepare() {
-	epatch_user
+	epatch "${PATCHES[@]}"
 }
 
 src_configure() {