diff --git a/templates/git/template b/templates/git/template
index 31c6367c352..0f588f74557 100644
--- a/templates/git/template
+++ b/templates/git/template
@@ -8,7 +8,7 @@ make_env="THREADED_DELTA_SEARCH=1"
 configure_args="--with-shell=/bin/sh --with-curl --with-expat --without-tcltk"
 make_install_target="DESTDIR=$XBPS_DESTDIR/$pkgname-$version install"
 short_desc="GIT Tree History Storage Tool"
-maintainer="Daniel Horecki <morr@morr.pl>"
+maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=aef4814634ac9ce8119fabc4bd1c363bb946f73ed34475a4baaad09a3fb23682
 long_desc="
  GIT is a \"directory content manager\" designed to handle absolutely massive
diff --git a/templates/ruby/template b/templates/ruby/template
index 387f0d2e5f5..1cdaed21373 100644
--- a/templates/ruby/template
+++ b/templates/ruby/template
@@ -8,7 +8,7 @@ build_style=gnu_configure
 configure_args="--enable-pthread --enable-shared
  --exec-prefix=$XBPS_DESTDIR/$pkgname-$version/usr"
 short_desc="Ruby programming language"
-maintainer="Daniel Horecki <morr@morr.pl>"
+maintainer="Juan RP <xtraeme@gmail.com>"
 checksum=a8f8a28e286dd76747d8e97ea5cfe7a315eb896906ab8c8606d687d9f6f6146e
 long_desc="
  Ruby is the interpreted scripting language for quick and