diff --git a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild
index df009435d..4be90a95a 100644
--- a/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild
+++ b/dev-vcs/git-cvs/git-cvs-2.3.1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc"
diff --git a/dev-vcs/git-cvs/git-cvs-2.3.2.ebuild b/dev-vcs/git-cvs/git-cvs-2.3.2.ebuild
index df009435d..4be90a95a 100644
--- a/dev-vcs/git-cvs/git-cvs-2.3.2.ebuild
+++ b/dev-vcs/git-cvs/git-cvs-2.3.2.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc"
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
index 109643775..d0b5a1286 100644
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
+++ b/dev-vcs/git-gui-tools/git-gui-tools-2.3.1.ebuild
@@ -28,11 +28,13 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/dev-vcs/git-gui-tools/git-gui-tools-2.3.2.ebuild b/dev-vcs/git-gui-tools/git-gui-tools-2.3.2.ebuild
index 109643775..d0b5a1286 100644
--- a/dev-vcs/git-gui-tools/git-gui-tools-2.3.2.ebuild
+++ b/dev-vcs/git-gui-tools/git-gui-tools-2.3.2.ebuild
@@ -28,11 +28,13 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
diff --git a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild
index 2cbe9cbf7..e86fde5c7 100644
--- a/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild
+++ b/dev-vcs/git-subversion/git-subversion-2.3.1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc iconv nls +threads"
diff --git a/dev-vcs/git-subversion/git-subversion-2.3.2.ebuild b/dev-vcs/git-subversion/git-subversion-2.3.2.ebuild
index 2cbe9cbf7..e86fde5c7 100644
--- a/dev-vcs/git-subversion/git-subversion-2.3.2.ebuild
+++ b/dev-vcs/git-subversion/git-subversion-2.3.2.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="doc iconv nls +threads"
diff --git a/dev-vcs/git/git-2.3.1.ebuild b/dev-vcs/git/git-2.3.1.ebuild
index 473c6e895..b6459343a 100644
--- a/dev-vcs/git/git-2.3.1.ebuild
+++ b/dev-vcs/git/git-2.3.1.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
diff --git a/dev-vcs/git/git-2.3.2.ebuild b/dev-vcs/git/git-2.3.2.ebuild
index 473c6e895..b6459343a 100644
--- a/dev-vcs/git/git-2.3.2.ebuild
+++ b/dev-vcs/git/git-2.3.2.ebuild
@@ -26,7 +26,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI_SUFFIX="xz"
 	SRC_URI_GOOG="http://git-core.googlecode.com/files"
 	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	SRC_URI+=" ${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+	SRC_URI="${SRC_URI_GOOG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_GOOG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
 			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
@@ -37,6 +37,8 @@ if [[ ${PV} != *9999 ]]; then
 	KEYWORDS="~amd64 ~x86"
 fi
 
+sab-patches_update_SRC_URI
+
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg gtk highlight +iconv mediawiki +nls +pcre +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
diff --git a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild
index 1b8b1b304..0445352b0 100644
--- a/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.8.10.ebuild
@@ -17,9 +17,11 @@ inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P/_/-}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild
index 811f2a707..eafea238a 100644
--- a/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild
+++ b/dev-vcs/subversion-java/subversion-java-1.8.11.ebuild
@@ -17,9 +17,11 @@ inherit sab-patches autotools eutils flag-o-matic java-pkg-2 libtool multilib
 
 DESCRIPTION="Java bindings for Subversion"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P/_/-}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-vcs/subversion/subversion-1.8.10.ebuild b/dev-vcs/subversion/subversion-1.8.10.ebuild
index d4ac9e734..57ea4f160 100644
--- a/dev-vcs/subversion/subversion-1.8.10.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.10.ebuild
@@ -14,9 +14,11 @@ inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/dev-vcs/subversion/subversion-1.8.11.ebuild b/dev-vcs/subversion/subversion-1.8.11.ebuild
index d1229b8e3..2b3220c31 100644
--- a/dev-vcs/subversion/subversion-1.8.11.ebuild
+++ b/dev-vcs/subversion/subversion-1.8.11.ebuild
@@ -14,9 +14,11 @@ inherit sab-patches autotools bash-completion-r1 db-use depend.apache distutils-
 MY_P="${P/_/-}"
 DESCRIPTION="Advanced version control system"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2"
 S="${WORKDIR}/${MY_P}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/eclass/sab-patches.eclass b/eclass/sab-patches.eclass
index 86a7acd0a..40e89911d 100644
--- a/eclass/sab-patches.eclass
+++ b/eclass/sab-patches.eclass
@@ -9,10 +9,13 @@
 # Sławomir Nizio <slawomir.nizio@sabayon.org>
 # @BLURB: eclass that makes it easier to apply patches from multiple packages
 # @DESCRIPTION:
-# Adds a patch or patches to SRC_URI and makes it easy to apply them,
+# Makes it easy to apply patches stored in a remote location
 # with the intention to make the task easier for Sabayon split ebuilds.
 # (Plain patches kept in a VCS are very nice, but in the case of split
 # ebuilds, duplicating the patches is not effective.)
+# Patches are not added to SRC_URI by default, because it makes ebuilds
+# use "SRC_URI+=..." which makes them more diverged from the original
+# one than necessary.
 # The eclass does not define any phase function.
 
 # @ECLASS-VARIABLE: SAB_PATCHES_SRC
@@ -31,10 +34,16 @@ if [[ ${#SAB_PATCHES_SRC[@]} -eq 0 ]]; then
 	die "SAB_PATCHES_SRC is not set"
 fi
 
-for _sab_patch in "${SAB_PATCHES_SRC[@]}"; do
-	SRC_URI=${_sab_patch}
-done
-unset _sab_patch
+# @FUNCTION: sab-patches_update_SRC_URI
+# @DESCRIPTION:
+# Appends patches entries to SRC_URI. If it is not done, an error will
+# occur later on.
+sab-patches_update_SRC_URI() {
+	local p
+	for p in "${SAB_PATCHES_SRC[@]}"; do
+		SRC_URI+=${SRC_URI:+ }${p}
+	done
+}
 
 # @FUNCTION: sab-patches_apply_all
 # @DESCRIPTION:
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild
index f52b85644..fa3c4ccb9 100644
--- a/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.8.10.ebuild
@@ -15,9 +15,11 @@ inherit sab-patches autotools db-use depend.apache flag-o-matic libtool multilib
 
 DESCRIPTION="Subversion WebDAV support"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2"
+SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
diff --git a/www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild b/www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild
index 571082c0a..f6943defc 100644
--- a/www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild
+++ b/www-apache/mod_dav_svn/mod_dav_svn-1.8.11.ebuild
@@ -15,9 +15,11 @@ inherit sab-patches autotools db-use depend.apache flag-o-matic libtool multilib
 
 DESCRIPTION="Subversion WebDAV support"
 HOMEPAGE="http://subversion.apache.org/"
-SRC_URI+=" mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2"
+SRC_URI="mirror://apache/${MY_SVN_PN}/${MY_SVN_P}.tar.bz2"
 S="${WORKDIR}/${MY_SVN_P}"
 
+sab-patches_update_SRC_URI
+
 LICENSE="Subversion"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"