summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/cxref/APKBUILD4
-rw-r--r--system/dash/APKBUILD2
-rw-r--r--system/file/APKBUILD2
-rw-r--r--system/ncurses/APKBUILD2
-rw-r--r--system/patch/APKBUILD2
-rw-r--r--system/perl-encode-eucjpascii/APKBUILD2
-rw-r--r--system/perl-encode-hanextra/APKBUILD2
-rw-r--r--system/perl-encode-iso2022/APKBUILD2
-rw-r--r--system/perl-encode-jisx0213/APKBUILD2
-rw-r--r--system/perl-http-message/APKBUILD2
-rw-r--r--system/perl-json/APKBUILD2
-rw-r--r--system/perl-mime-charset/APKBUILD2
-rw-r--r--system/perl-pod2-base/APKBUILD2
-rw-r--r--system/perl-sgmls/APKBUILD2
-rw-r--r--system/perl-test-fatal/APKBUILD2
-rw-r--r--system/perl-test-needs/APKBUILD2
-rw-r--r--system/perl-try-tiny/APKBUILD2
-rw-r--r--system/perl-unicode-linebreak/APKBUILD2
-rw-r--r--system/perl-uri/APKBUILD2
-rw-r--r--system/perl/APKBUILD2
-rw-r--r--system/python3/APKBUILD2
-rw-r--r--system/rsync/APKBUILD2
-rw-r--r--system/sed/APKBUILD2
-rw-r--r--system/uucp/APKBUILD4
-rw-r--r--system/vim/APKBUILD2
-rw-r--r--user/alpine/APKBUILD4
-rw-r--r--user/apache-httpd/APKBUILD4
-rw-r--r--user/aspell-dict-af/APKBUILD4
-rw-r--r--user/aspell-dict-am/APKBUILD4
-rw-r--r--user/aspell-dict-ar/APKBUILD4
-rw-r--r--user/aspell-dict-ast/APKBUILD4
-rw-r--r--user/aspell-dict-az/APKBUILD4
-rw-r--r--user/aspell-dict-be/APKBUILD4
-rw-r--r--user/aspell-dict-bg/APKBUILD4
-rw-r--r--user/aspell-dict-bn/APKBUILD4
-rw-r--r--user/aspell-dict-br/APKBUILD4
-rw-r--r--user/aspell-dict-ca/APKBUILD4
-rw-r--r--user/aspell-dict-cs/APKBUILD4
-rw-r--r--user/aspell-dict-csb/APKBUILD4
-rw-r--r--user/aspell-dict-cy/APKBUILD4
-rw-r--r--user/aspell-dict-da/APKBUILD4
-rw-r--r--user/aspell-dict-de-alt/APKBUILD4
-rw-r--r--user/aspell-dict-de/APKBUILD4
-rw-r--r--user/aspell-dict-el/APKBUILD4
-rw-r--r--user/aspell-dict-en/APKBUILD4
-rw-r--r--user/aspell-dict-eo/APKBUILD4
-rw-r--r--user/aspell-dict-es/APKBUILD4
-rw-r--r--user/aspell-dict-et/APKBUILD4
-rw-r--r--user/aspell-dict-fa/APKBUILD4
-rw-r--r--user/aspell-dict-fi/APKBUILD4
-rw-r--r--user/aspell-dict-fo/APKBUILD4
-rw-r--r--user/aspell-dict-fr/APKBUILD4
-rw-r--r--user/aspell-dict-fy/APKBUILD4
-rw-r--r--user/aspell-dict-ga/APKBUILD4
-rw-r--r--user/aspell-dict-gd/APKBUILD4
-rw-r--r--user/aspell-dict-gl/APKBUILD4
-rw-r--r--user/aspell-dict-grc/APKBUILD4
-rw-r--r--user/aspell-dict-gu/APKBUILD4
-rw-r--r--user/aspell-dict-gv/APKBUILD4
-rw-r--r--user/aspell-dict-he/APKBUILD4
-rw-r--r--user/aspell-dict-hi/APKBUILD4
-rw-r--r--user/aspell-dict-hil/APKBUILD4
-rw-r--r--user/aspell-dict-hr/APKBUILD4
-rw-r--r--user/aspell-dict-hsb/APKBUILD4
-rw-r--r--user/aspell-dict-hu/APKBUILD4
-rw-r--r--user/aspell-dict-hus/APKBUILD4
-rw-r--r--user/aspell-dict-hy/APKBUILD4
-rw-r--r--user/aspell-dict-ia/APKBUILD4
-rw-r--r--user/aspell-dict-id/APKBUILD4
-rw-r--r--user/aspell-dict-is/APKBUILD4
-rw-r--r--user/aspell-dict-it/APKBUILD4
-rw-r--r--user/aspell-dict-kn/APKBUILD4
-rw-r--r--user/aspell-dict-ku/APKBUILD4
-rw-r--r--user/aspell-dict-ky/APKBUILD4
-rw-r--r--user/aspell-dict-la/APKBUILD4
-rw-r--r--user/aspell-dict-lt/APKBUILD4
-rw-r--r--user/aspell-dict-lv/APKBUILD4
-rw-r--r--user/aspell-dict-mg/APKBUILD4
-rw-r--r--user/aspell-dict-mi/APKBUILD4
-rw-r--r--user/aspell-dict-mk/APKBUILD4
-rw-r--r--user/aspell-dict-ml/APKBUILD4
-rw-r--r--user/aspell-dict-mn/APKBUILD4
-rw-r--r--user/aspell-dict-mr/APKBUILD4
-rw-r--r--user/aspell-dict-ms/APKBUILD4
-rw-r--r--user/aspell-dict-mt/APKBUILD4
-rw-r--r--user/aspell-dict-nb/APKBUILD4
-rw-r--r--user/aspell-dict-nds/APKBUILD4
-rw-r--r--user/aspell-dict-nl/APKBUILD4
-rw-r--r--user/aspell-dict-nn/APKBUILD4
-rw-r--r--user/aspell-dict-ny/APKBUILD4
-rw-r--r--user/aspell-dict-or/APKBUILD4
-rw-r--r--user/aspell-dict-pa/APKBUILD4
-rw-r--r--user/aspell-dict-pl/APKBUILD4
-rw-r--r--user/aspell-dict-pt_BR/APKBUILD4
-rw-r--r--user/aspell-dict-pt_PT/APKBUILD4
-rw-r--r--user/aspell-dict-qu/APKBUILD4
-rw-r--r--user/aspell-dict-ro/APKBUILD4
-rw-r--r--user/aspell-dict-ru/APKBUILD4
-rw-r--r--user/aspell-dict-rw/APKBUILD4
-rw-r--r--user/aspell-dict-sc/APKBUILD4
-rw-r--r--user/aspell-dict-sk/APKBUILD4
-rw-r--r--user/aspell-dict-sl/APKBUILD4
-rw-r--r--user/aspell-dict-sr/APKBUILD4
-rw-r--r--user/aspell-dict-sv/APKBUILD4
-rw-r--r--user/aspell-dict-sw/APKBUILD4
-rw-r--r--user/aspell-dict-ta/APKBUILD4
-rw-r--r--user/aspell-dict-te/APKBUILD4
-rw-r--r--user/aspell-dict-tet/APKBUILD4
-rw-r--r--user/aspell-dict-tk/APKBUILD4
-rw-r--r--user/aspell-dict-tl/APKBUILD4
-rw-r--r--user/aspell-dict-tn/APKBUILD4
-rw-r--r--user/aspell-dict-tr/APKBUILD4
-rw-r--r--user/aspell-dict-uk/APKBUILD4
-rw-r--r--user/aspell-dict-uz/APKBUILD4
-rw-r--r--user/aspell-dict-vi/APKBUILD4
-rw-r--r--user/aspell-dict-wa/APKBUILD4
-rw-r--r--user/aspell-dict-yi/APKBUILD4
-rw-r--r--user/aspell-dict-zu/APKBUILD4
-rw-r--r--user/atkmm/APKBUILD4
-rw-r--r--user/atril/APKBUILD4
-rw-r--r--user/ayatana-ido/APKBUILD4
-rw-r--r--user/bash-completion/APKBUILD2
-rw-r--r--user/bitlbee/APKBUILD4
-rw-r--r--user/cairomm/APKBUILD4
-rw-r--r--user/caja-dropbox/APKBUILD4
-rw-r--r--user/caja-extensions/APKBUILD4
-rw-r--r--user/caja/APKBUILD4
-rw-r--r--user/catfish/APKBUILD4
-rw-r--r--user/cloc/APKBUILD4
-rw-r--r--user/clutter/APKBUILD4
-rw-r--r--user/cogl/APKBUILD4
-rw-r--r--user/compton-conf/APKBUILD4
-rw-r--r--user/compton/APKBUILD4
-rw-r--r--user/dconf/APKBUILD4
-rw-r--r--user/dina/APKBUILD4
-rw-r--r--user/engrampa/APKBUILD4
-rw-r--r--user/eom/APKBUILD4
-rw-r--r--user/exo/APKBUILD4
-rw-r--r--user/featherpad/APKBUILD4
-rw-r--r--user/ffmpegthumbnailer/APKBUILD4
-rw-r--r--user/fish/APKBUILD2
-rw-r--r--user/flite/APKBUILD4
-rw-r--r--user/garcon/APKBUILD4
-rw-r--r--user/gleam/APKBUILD4
-rw-r--r--user/glibmm/APKBUILD4
-rw-r--r--user/gtkmm+3.0/APKBUILD4
-rw-r--r--user/gtksourceview-3.0/APKBUILD4
-rw-r--r--user/gucharmap/APKBUILD4
-rw-r--r--user/gvim/APKBUILD2
-rw-r--r--user/icewm/APKBUILD4
-rw-r--r--user/ido/APKBUILD4
-rw-r--r--user/irssi/APKBUILD4
-rw-r--r--user/json-glib/APKBUILD4
-rw-r--r--user/keybinder-3.0/APKBUILD4
-rw-r--r--user/libass/APKBUILD4
-rw-r--r--user/libayatana-indicator/APKBUILD4
-rw-r--r--user/libburn/APKBUILD4
-rw-r--r--user/libfakekey/APKBUILD4
-rw-r--r--user/libfm-qt/APKBUILD4
-rw-r--r--user/libglade/APKBUILD4
-rw-r--r--user/libgnome-keyring/APKBUILD4
-rw-r--r--user/libgtop/APKBUILD4
-rw-r--r--user/libindicator/APKBUILD4
-rw-r--r--user/libisofs/APKBUILD4
-rw-r--r--user/liblxqt/APKBUILD4
-rw-r--r--user/libmatekbd/APKBUILD4
-rw-r--r--user/libmatemixer/APKBUILD4
-rw-r--r--user/libmateweather/APKBUILD4
-rw-r--r--user/libmpd/APKBUILD4
-rw-r--r--user/libopenraw/APKBUILD4
-rw-r--r--user/libpeas/APKBUILD4
-rw-r--r--user/libpsl/APKBUILD4
-rw-r--r--user/libqtxdg/APKBUILD4
-rw-r--r--user/libsigc++/APKBUILD4
-rw-r--r--user/libsoup/APKBUILD4
-rw-r--r--user/libstatgrab/APKBUILD4
-rw-r--r--user/libsysstat/APKBUILD4
-rw-r--r--user/libwebp/APKBUILD2
-rw-r--r--user/libwnck/APKBUILD4
-rw-r--r--user/libxfce4ui/APKBUILD4
-rw-r--r--user/libxfce4util/APKBUILD4
-rw-r--r--user/libxklavier/APKBUILD4
-rw-r--r--user/lua-expat/APKBUILD2
-rw-r--r--user/lua-filesystem/APKBUILD2
-rw-r--r--user/lua-socket/APKBUILD2
-rw-r--r--user/luarocks/APKBUILD4
-rw-r--r--user/lximage-qt/APKBUILD4
-rw-r--r--user/lxmenu-data/APKBUILD4
-rw-r--r--user/lxqt-about/APKBUILD4
-rw-r--r--user/lxqt-admin/APKBUILD4
-rw-r--r--user/lxqt-build-tools/APKBUILD4
-rw-r--r--user/lxqt-config/APKBUILD4
-rw-r--r--user/lxqt-desktop/APKBUILD4
-rw-r--r--user/lxqt-globalkeys/APKBUILD4
-rw-r--r--user/lxqt-l10n/APKBUILD4
-rw-r--r--user/lxqt-notificationd/APKBUILD4
-rw-r--r--user/lxqt-openssh-askpass/APKBUILD4
-rw-r--r--user/lxqt-panel/APKBUILD4
-rw-r--r--user/lxqt-policykit/APKBUILD4
-rw-r--r--user/lxqt-powermanagement/APKBUILD4
-rw-r--r--user/lxqt-qtplugin/APKBUILD4
-rw-r--r--user/lxqt-runner/APKBUILD4
-rw-r--r--user/lxqt-session/APKBUILD4
-rw-r--r--user/lxqt-sudo/APKBUILD4
-rw-r--r--user/lxqt-themes/APKBUILD4
-rw-r--r--user/lynx/APKBUILD4
-rw-r--r--user/marco/APKBUILD4
-rw-r--r--user/mate-applets/APKBUILD4
-rw-r--r--user/mate-backgrounds/APKBUILD4
-rw-r--r--user/mate-calc/APKBUILD4
-rw-r--r--user/mate-common/APKBUILD4
-rw-r--r--user/mate-complete/APKBUILD4
-rw-r--r--user/mate-control-center/APKBUILD4
-rw-r--r--user/mate-desktop/APKBUILD4
-rw-r--r--user/mate-icon-theme/APKBUILD4
-rw-r--r--user/mate-indicator-applet/APKBUILD4
-rw-r--r--user/mate-media/APKBUILD4
-rw-r--r--user/mate-menus/APKBUILD4
-rw-r--r--user/mate-netbook/APKBUILD4
-rw-r--r--user/mate-notification-daemon/APKBUILD4
-rw-r--r--user/mate-panel/APKBUILD4
-rw-r--r--user/mate-polkit/APKBUILD4
-rw-r--r--user/mate-power-manager/APKBUILD4
-rw-r--r--user/mate-screensaver/APKBUILD4
-rw-r--r--user/mate-sensors-applet/APKBUILD4
-rw-r--r--user/mate-session-manager/APKBUILD4
-rw-r--r--user/mate-settings-daemon/APKBUILD4
-rw-r--r--user/mate-system-monitor/APKBUILD4
-rw-r--r--user/mate-terminal/APKBUILD4
-rw-r--r--user/mate-user-guide/APKBUILD4
-rw-r--r--user/mate-user-share/APKBUILD4
-rw-r--r--user/mate-utils/APKBUILD4
-rw-r--r--user/mimetic/APKBUILD4
-rw-r--r--user/mousepad/APKBUILD4
-rw-r--r--user/mozo/APKBUILD4
-rw-r--r--user/mplayer/APKBUILD4
-rw-r--r--user/mpv/APKBUILD4
-rw-r--r--user/muparser/APKBUILD4
-rw-r--r--user/netsurf/APKBUILD4
-rw-r--r--user/obconf-qt/APKBUILD4
-rw-r--r--user/orage/APKBUILD4
-rw-r--r--user/otf-culmus/APKBUILD4
-rw-r--r--user/otf-exo/APKBUILD4
-rw-r--r--user/otf-office-code-pro/APKBUILD4
-rw-r--r--user/otf-proggy-vector/APKBUILD4
-rw-r--r--user/otf-source-code-pro/APKBUILD4
-rw-r--r--user/otf-source-sans-pro/APKBUILD4
-rw-r--r--user/otf-source-serif-pro/APKBUILD4
-rw-r--r--user/pangomm/APKBUILD4
-rw-r--r--user/parole/APKBUILD4
-rw-r--r--user/pavucontrol-qt/APKBUILD4
-rw-r--r--user/pavucontrol/APKBUILD4
-rw-r--r--user/pcmanfm-qt/APKBUILD4
-rw-r--r--user/pcmanfm/APKBUILD4
-rw-r--r--user/perl-app-licensecheck/APKBUILD2
-rw-r--r--user/perl-b-hooks-op-check/APKBUILD2
-rw-r--r--user/perl-bareword-filehandles/APKBUILD2
-rw-r--r--user/perl-cpan-changes/APKBUILD2
-rw-r--r--user/perl-data-dump/APKBUILD2
-rw-r--r--user/perl-data-section/APKBUILD2
-rw-r--r--user/perl-devel-hide/APKBUILD2
-rw-r--r--user/perl-importer/APKBUILD2
-rw-r--r--user/perl-indirect/APKBUILD2
-rw-r--r--user/perl-multidimensional/APKBUILD2
-rw-r--r--user/perl-net-dbus/APKBUILD2
-rw-r--r--user/perl-net-snmp/APKBUILD2
-rw-r--r--user/perl-number-range/APKBUILD2
-rw-r--r--user/perl-parallel-forkmanager/APKBUILD2
-rw-r--r--user/perl-path-iterator-rule/APKBUILD2
-rw-r--r--user/perl-pod-constants/APKBUILD2
-rw-r--r--user/perl-probe-perl/APKBUILD2
-rw-r--r--user/perl-regexp-common/APKBUILD2
-rw-r--r--user/perl-regexp-pattern-license/APKBUILD2
-rw-r--r--user/perl-regexp-pattern/APKBUILD2
-rw-r--r--user/perl-software-license/APKBUILD2
-rw-r--r--user/perl-sort-key/APKBUILD2
-rw-r--r--user/perl-strictures/APKBUILD2
-rw-r--r--user/perl-string-copyright/APKBUILD2
-rw-r--r--user/perl-string-escape/APKBUILD2
-rw-r--r--user/perl-sub-info/APKBUILD2
-rw-r--r--user/perl-term-size-any/APKBUILD2
-rw-r--r--user/perl-term-size-perl/APKBUILD2
-rw-r--r--user/perl-term-table/APKBUILD2
-rw-r--r--user/perl-test-command/APKBUILD2
-rw-r--r--user/perl-test-failwarnings/APKBUILD2
-rw-r--r--user/perl-test-filename/APKBUILD2
-rw-r--r--user/perl-test-more-utf8/APKBUILD2
-rw-r--r--user/perl-test-script/APKBUILD2
-rw-r--r--user/perl-test2-suite/APKBUILD2
-rw-r--r--user/perl-text-template/APKBUILD2
-rw-r--r--user/perl-xml-namespacesupport/APKBUILD2
-rw-r--r--user/perl-xml-simple/APKBUILD2
-rw-r--r--user/pluma/APKBUILD4
-rw-r--r--user/prosody/APKBUILD2
-rw-r--r--user/protobuf/APKBUILD2
-rw-r--r--user/py3-distutils-extra/APKBUILD4
-rw-r--r--user/py3-pexpect/APKBUILD4
-rw-r--r--user/py3-ptyprocess/APKBUILD4
-rw-r--r--user/py3-pycairo/APKBUILD4
-rw-r--r--user/py3-pygobject/APKBUILD4
-rw-r--r--user/qps/APKBUILD4
-rw-r--r--user/qt5ct/APKBUILD4
-rw-r--r--user/qterminal/APKBUILD4
-rw-r--r--user/qtermwidget/APKBUILD4
-rw-r--r--user/qtkeychain/APKBUILD4
-rw-r--r--user/ristretto/APKBUILD4
-rw-r--r--user/rubberband/APKBUILD4
-rw-r--r--user/screengrab/APKBUILD4
-rw-r--r--user/socat/APKBUILD4
-rw-r--r--user/spectrwm/APKBUILD4
-rw-r--r--user/tf/APKBUILD4
-rw-r--r--user/thunar-volman/APKBUILD4
-rw-r--r--user/thunar/APKBUILD4
-rw-r--r--user/trojita/APKBUILD4
-rw-r--r--user/ttf-sudo/APKBUILD4
-rw-r--r--user/ttf-terminus/APKBUILD4
-rw-r--r--user/tumbler/APKBUILD4
-rw-r--r--user/uchardet/APKBUILD4
-rw-r--r--user/unicode-data/APKBUILD4
-rw-r--r--user/uptimed/APKBUILD2
-rw-r--r--user/vala/APKBUILD4
-rw-r--r--user/vamp-sdk/APKBUILD4
-rw-r--r--user/vte/APKBUILD4
-rw-r--r--user/weechat/APKBUILD2
-rw-r--r--user/which/APKBUILD2
-rw-r--r--user/xdg-user-dirs/APKBUILD4
-rw-r--r--user/xfburn/APKBUILD4
-rw-r--r--user/xfce-desktop/APKBUILD4
-rw-r--r--user/xfce-plugins/APKBUILD4
-rw-r--r--user/xfce4-appfinder/APKBUILD4
-rw-r--r--user/xfce4-battery-plugin/APKBUILD4
-rw-r--r--user/xfce4-clipman-plugin/APKBUILD4
-rw-r--r--user/xfce4-cpugraph-plugin/APKBUILD4
-rw-r--r--user/xfce4-dict/APKBUILD4
-rw-r--r--user/xfce4-diskperf-plugin/APKBUILD4
-rw-r--r--user/xfce4-indicator-plugin/APKBUILD4
-rw-r--r--user/xfce4-netload-plugin/APKBUILD4
-rw-r--r--user/xfce4-notifyd/APKBUILD4
-rw-r--r--user/xfce4-panel-profiles/APKBUILD4
-rw-r--r--user/xfce4-panel/APKBUILD4
-rw-r--r--user/xfce4-power-manager/APKBUILD4
-rw-r--r--user/xfce4-pulseaudio-plugin/APKBUILD4
-rw-r--r--user/xfce4-screenshooter/APKBUILD4
-rw-r--r--user/xfce4-sensors-plugin/APKBUILD4
-rw-r--r--user/xfce4-session/APKBUILD4
-rw-r--r--user/xfce4-settings/APKBUILD4
-rw-r--r--user/xfce4-systemload-plugin/APKBUILD4
-rw-r--r--user/xfce4-taskmanager/APKBUILD4
-rw-r--r--user/xfce4-terminal/APKBUILD4
-rw-r--r--user/xfce4-time-out-plugin/APKBUILD4
-rw-r--r--user/xfce4-timer-plugin/APKBUILD4
-rw-r--r--user/xfce4-verve-plugin/APKBUILD4
-rw-r--r--user/xfce4-volumed-pulse/APKBUILD4
-rw-r--r--user/xfce4-whiskermenu-plugin/APKBUILD4
-rw-r--r--user/xfconf/APKBUILD4
-rw-r--r--user/xfdashboard/APKBUILD4
-rw-r--r--user/xfdesktop/APKBUILD4
-rw-r--r--user/xfmpc/APKBUILD4
-rw-r--r--user/xfwm4/APKBUILD4
-rw-r--r--user/xorg-gtest/APKBUILD4
-rw-r--r--user/xscreensaver/APKBUILD4
-rw-r--r--user/xterm/APKBUILD4
-rw-r--r--user/yubico-c/APKBUILD4
-rw-r--r--user/yubikey-personalization/APKBUILD4
-rw-r--r--user/zenity/APKBUILD4
365 files changed, 657 insertions, 657 deletions
diff --git a/system/cxref/APKBUILD b/system/cxref/APKBUILD
index eeea821be..f1bc75fb4 100644
--- a/system/cxref/APKBUILD
+++ b/system/cxref/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cxref
pkgver=1.6e
pkgrel=0
diff --git a/system/dash/APKBUILD b/system/dash/APKBUILD
index 04b81b17f..8abd44b65 100644
--- a/system/dash/APKBUILD
+++ b/system/dash/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dash
pkgver=0.5.10.2
pkgrel=0
diff --git a/system/file/APKBUILD b/system/file/APKBUILD
index b1c337355..0e093ec4b 100644
--- a/system/file/APKBUILD
+++ b/system/file/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Valery Kartel <valery.kartel@gmail.com>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=file
pkgver=5.37
pkgrel=0
diff --git a/system/ncurses/APKBUILD b/system/ncurses/APKBUILD
index 414283adf..5a28c9100 100644
--- a/system/ncurses/APKBUILD
+++ b/system/ncurses/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ncurses
pkgver=6.1
_ver=${pkgver}-20190713
diff --git a/system/patch/APKBUILD b/system/patch/APKBUILD
index 5831ede3a..b299382c9 100644
--- a/system/patch/APKBUILD
+++ b/system/patch/APKBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=patch
pkgver=2.7.6
pkgrel=4
diff --git a/system/perl-encode-eucjpascii/APKBUILD b/system/perl-encode-eucjpascii/APKBUILD
index adb4c21de..02ed7b7e3 100644
--- a/system/perl-encode-eucjpascii/APKBUILD
+++ b/system/perl-encode-eucjpascii/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-eucjpascii
_pkgreal=Encode-EUCJPASCII
diff --git a/system/perl-encode-hanextra/APKBUILD b/system/perl-encode-hanextra/APKBUILD
index f00fb7a15..6d52e5647 100644
--- a/system/perl-encode-hanextra/APKBUILD
+++ b/system/perl-encode-hanextra/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-hanextra
_pkgreal=Encode-HanExtra
diff --git a/system/perl-encode-iso2022/APKBUILD b/system/perl-encode-iso2022/APKBUILD
index d9e9928a0..b59b3a5cb 100644
--- a/system/perl-encode-iso2022/APKBUILD
+++ b/system/perl-encode-iso2022/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-iso2022
_pkgreal=Encode-ISO2022
diff --git a/system/perl-encode-jisx0213/APKBUILD b/system/perl-encode-jisx0213/APKBUILD
index 9d939a39b..5a956d1aa 100644
--- a/system/perl-encode-jisx0213/APKBUILD
+++ b/system/perl-encode-jisx0213/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-encode-jisx0213
_pkgreal=Encode-JISX0213
diff --git a/system/perl-http-message/APKBUILD b/system/perl-http-message/APKBUILD
index 39f8523dc..839df093e 100644
--- a/system/perl-http-message/APKBUILD
+++ b/system/perl-http-message/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-http-message
_pkgreal=HTTP-Message
diff --git a/system/perl-json/APKBUILD b/system/perl-json/APKBUILD
index ee0c36dc8..e3ce567bb 100644
--- a/system/perl-json/APKBUILD
+++ b/system/perl-json/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-json
_pkgreal=JSON
diff --git a/system/perl-mime-charset/APKBUILD b/system/perl-mime-charset/APKBUILD
index 2dd9090bc..4a04e17e9 100644
--- a/system/perl-mime-charset/APKBUILD
+++ b/system/perl-mime-charset/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-mime-charset
_pkgreal=MIME-Charset
diff --git a/system/perl-pod2-base/APKBUILD b/system/perl-pod2-base/APKBUILD
index 5ba39c600..05703bcf6 100644
--- a/system/perl-pod2-base/APKBUILD
+++ b/system/perl-pod2-base/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod2-base
_pkgreal=POD2-Base
diff --git a/system/perl-sgmls/APKBUILD b/system/perl-sgmls/APKBUILD
index a4991b8f2..e6ceae295 100644
--- a/system/perl-sgmls/APKBUILD
+++ b/system/perl-sgmls/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sgmls
_pkgreal=SGMLSpm
diff --git a/system/perl-test-fatal/APKBUILD b/system/perl-test-fatal/APKBUILD
index f6336e2af..e97893fda 100644
--- a/system/perl-test-fatal/APKBUILD
+++ b/system/perl-test-fatal/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-fatal
_pkgreal=Test-Fatal
diff --git a/system/perl-test-needs/APKBUILD b/system/perl-test-needs/APKBUILD
index 439a52ade..0d098b55c 100644
--- a/system/perl-test-needs/APKBUILD
+++ b/system/perl-test-needs/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-needs
_pkgreal=Test-Needs
diff --git a/system/perl-try-tiny/APKBUILD b/system/perl-try-tiny/APKBUILD
index 36129e2a3..4078a2f5e 100644
--- a/system/perl-try-tiny/APKBUILD
+++ b/system/perl-try-tiny/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-try-tiny
_pkgreal=Try-Tiny
diff --git a/system/perl-unicode-linebreak/APKBUILD b/system/perl-unicode-linebreak/APKBUILD
index 5bff8e644..907b970b3 100644
--- a/system/perl-unicode-linebreak/APKBUILD
+++ b/system/perl-unicode-linebreak/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-unicode-linebreak
_pkgreal=Unicode-LineBreak
diff --git a/system/perl-uri/APKBUILD b/system/perl-uri/APKBUILD
index 13763a256..1f3cbec5c 100644
--- a/system/perl-uri/APKBUILD
+++ b/system/perl-uri/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-uri
_pkgreal=URI
diff --git a/system/perl/APKBUILD b/system/perl/APKBUILD
index 4df8d9e58..0fc25d609 100644
--- a/system/perl/APKBUILD
+++ b/system/perl/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: Valery Kartel <valery.kartel@gmail.com>
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
# Proxy-For: solar
pkgname=perl
diff --git a/system/python3/APKBUILD b/system/python3/APKBUILD
index f5d28b236..b8c72f3a7 100644
--- a/system/python3/APKBUILD
+++ b/system/python3/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=python3
pkgver=3.6.9
diff --git a/system/rsync/APKBUILD b/system/rsync/APKBUILD
index 926c741d0..e93da8552 100644
--- a/system/rsync/APKBUILD
+++ b/system/rsync/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=rsync
pkgver=3.1.3
pkgrel=1
diff --git a/system/sed/APKBUILD b/system/sed/APKBUILD
index 8b90aaee0..545d10970 100644
--- a/system/sed/APKBUILD
+++ b/system/sed/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=sed
pkgver=4.7
pkgrel=0
diff --git a/system/uucp/APKBUILD b/system/uucp/APKBUILD
index d17de7902..422f28ae5 100644
--- a/system/uucp/APKBUILD
+++ b/system/uucp/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uucp
pkgver=1.07
pkgrel=0
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 0e17d805a..80698a759 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vim
pkgver=8.1.2311
pkgrel=0
diff --git a/user/alpine/APKBUILD b/user/alpine/APKBUILD
index 189057dea..b879bf772 100644
--- a/user/alpine/APKBUILD
+++ b/user/alpine/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=alpine
pkgver=2.21
pkgrel=0
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index 1588b844b..23cdefac2 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=apache-httpd
_pkgreal=httpd
pkgver=2.4.41
diff --git a/user/aspell-dict-af/APKBUILD b/user/aspell-dict-af/APKBUILD
index b06ffd33f..56796d976 100644
--- a/user/aspell-dict-af/APKBUILD
+++ b/user/aspell-dict-af/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-af
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-am/APKBUILD b/user/aspell-dict-am/APKBUILD
index a4be5ad68..de662f3a4 100644
--- a/user/aspell-dict-am/APKBUILD
+++ b/user/aspell-dict-am/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-am
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ar/APKBUILD b/user/aspell-dict-ar/APKBUILD
index 34ffabad4..760f4c5cd 100644
--- a/user/aspell-dict-ar/APKBUILD
+++ b/user/aspell-dict-ar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ar
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ast/APKBUILD b/user/aspell-dict-ast/APKBUILD
index c8fdd5708..e361f640f 100644
--- a/user/aspell-dict-ast/APKBUILD
+++ b/user/aspell-dict-ast/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ast
pkgver=0.01
pkgrel=0
diff --git a/user/aspell-dict-az/APKBUILD b/user/aspell-dict-az/APKBUILD
index 62cc4508d..d6ac652ea 100644
--- a/user/aspell-dict-az/APKBUILD
+++ b/user/aspell-dict-az/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-az
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-be/APKBUILD b/user/aspell-dict-be/APKBUILD
index a25306568..cd77add91 100644
--- a/user/aspell-dict-be/APKBUILD
+++ b/user/aspell-dict-be/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-be
pkgver=0.01
pkgrel=0
diff --git a/user/aspell-dict-bg/APKBUILD b/user/aspell-dict-bg/APKBUILD
index 3af15fa3a..0c4418a0b 100644
--- a/user/aspell-dict-bg/APKBUILD
+++ b/user/aspell-dict-bg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-bg
pkgver=4.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-bn/APKBUILD b/user/aspell-dict-bn/APKBUILD
index a2a9c9eac..e55c63c56 100644
--- a/user/aspell-dict-bn/APKBUILD
+++ b/user/aspell-dict-bn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-bn
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-br/APKBUILD b/user/aspell-dict-br/APKBUILD
index 60204987a..4df5d6d82 100644
--- a/user/aspell-dict-br/APKBUILD
+++ b/user/aspell-dict-br/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-br
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ca/APKBUILD b/user/aspell-dict-ca/APKBUILD
index 9facc23cf..797cf8d1a 100644
--- a/user/aspell-dict-ca/APKBUILD
+++ b/user/aspell-dict-ca/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ca
pkgver=2.1.5.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-cs/APKBUILD b/user/aspell-dict-cs/APKBUILD
index 768829bb9..e4686842f 100644
--- a/user/aspell-dict-cs/APKBUILD
+++ b/user/aspell-dict-cs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-cs
pkgver=20040614.1
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-csb/APKBUILD b/user/aspell-dict-csb/APKBUILD
index c2ceff90b..97bf70171 100644
--- a/user/aspell-dict-csb/APKBUILD
+++ b/user/aspell-dict-csb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-csb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-cy/APKBUILD b/user/aspell-dict-cy/APKBUILD
index 4cdd1a287..52ee43f5c 100644
--- a/user/aspell-dict-cy/APKBUILD
+++ b/user/aspell-dict-cy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-cy
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-da/APKBUILD b/user/aspell-dict-da/APKBUILD
index 230fabcdd..4a9db6552 100644
--- a/user/aspell-dict-da/APKBUILD
+++ b/user/aspell-dict-da/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-da
pkgver=1.4.42.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-de-alt/APKBUILD b/user/aspell-dict-de-alt/APKBUILD
index 0d8effa19..f05bc1ae3 100644
--- a/user/aspell-dict-de-alt/APKBUILD
+++ b/user/aspell-dict-de-alt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-de-alt
pkgver=2.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-de/APKBUILD b/user/aspell-dict-de/APKBUILD
index 080984aa3..25c391732 100644
--- a/user/aspell-dict-de/APKBUILD
+++ b/user/aspell-dict-de/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-de
pkgver=20161207
pkgrel=0
diff --git a/user/aspell-dict-el/APKBUILD b/user/aspell-dict-el/APKBUILD
index 37149af35..6fc2cd3d2 100644
--- a/user/aspell-dict-el/APKBUILD
+++ b/user/aspell-dict-el/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-el
pkgver=0.08.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-en/APKBUILD b/user/aspell-dict-en/APKBUILD
index c3a848440..21517d44b 100644
--- a/user/aspell-dict-en/APKBUILD
+++ b/user/aspell-dict-en/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-en
pkgver=2018.04.16.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-eo/APKBUILD b/user/aspell-dict-eo/APKBUILD
index a03d2b2c8..5f49b0a92 100644
--- a/user/aspell-dict-eo/APKBUILD
+++ b/user/aspell-dict-eo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-eo
pkgver=2.1.20000225.a2
_pkgver=${pkgver%.*}${pkgver#*.*.*.}
diff --git a/user/aspell-dict-es/APKBUILD b/user/aspell-dict-es/APKBUILD
index 9216f3bec..fb42ad659 100644
--- a/user/aspell-dict-es/APKBUILD
+++ b/user/aspell-dict-es/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-es
pkgver=1.11.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-et/APKBUILD b/user/aspell-dict-et/APKBUILD
index d352e745e..183fd86ae 100644
--- a/user/aspell-dict-et/APKBUILD
+++ b/user/aspell-dict-et/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-et
pkgver=0.1.21.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-fa/APKBUILD b/user/aspell-dict-fa/APKBUILD
index d08a32657..3ec768d9f 100644
--- a/user/aspell-dict-fa/APKBUILD
+++ b/user/aspell-dict-fa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fa
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fi/APKBUILD b/user/aspell-dict-fi/APKBUILD
index 6a4666ded..85cd4ff7b 100644
--- a/user/aspell-dict-fi/APKBUILD
+++ b/user/aspell-dict-fi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fi
pkgver=0.7.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fo/APKBUILD b/user/aspell-dict-fo/APKBUILD
index eef2193a8..4915f0f44 100644
--- a/user/aspell-dict-fo/APKBUILD
+++ b/user/aspell-dict-fo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fo
pkgver=0.2.16.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-fr/APKBUILD b/user/aspell-dict-fr/APKBUILD
index 0685c068f..2683a54cb 100644
--- a/user/aspell-dict-fr/APKBUILD
+++ b/user/aspell-dict-fr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fr
pkgver=0.50.3
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-fy/APKBUILD b/user/aspell-dict-fy/APKBUILD
index 6eee693fe..c63cd7d79 100644
--- a/user/aspell-dict-fy/APKBUILD
+++ b/user/aspell-dict-fy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-fy
pkgver=0.12.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ga/APKBUILD b/user/aspell-dict-ga/APKBUILD
index 7ade44261..cbb27a26f 100644
--- a/user/aspell-dict-ga/APKBUILD
+++ b/user/aspell-dict-ga/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ga
pkgver=5.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gd/APKBUILD b/user/aspell-dict-gd/APKBUILD
index fa14b77b8..8e4ab7d5f 100644
--- a/user/aspell-dict-gd/APKBUILD
+++ b/user/aspell-dict-gd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gd
pkgver=0.1.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-gl/APKBUILD b/user/aspell-dict-gl/APKBUILD
index e586b4682..1295e7596 100644
--- a/user/aspell-dict-gl/APKBUILD
+++ b/user/aspell-dict-gl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gl
pkgver=0.5.a2
_pkgver=${pkgver%.*}${pkgver#*.*.}
diff --git a/user/aspell-dict-grc/APKBUILD b/user/aspell-dict-grc/APKBUILD
index 39bd4b1b8..dda7b5538 100644
--- a/user/aspell-dict-grc/APKBUILD
+++ b/user/aspell-dict-grc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-grc
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gu/APKBUILD b/user/aspell-dict-gu/APKBUILD
index 04fac1de1..d218cc786 100644
--- a/user/aspell-dict-gu/APKBUILD
+++ b/user/aspell-dict-gu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gu
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-gv/APKBUILD b/user/aspell-dict-gv/APKBUILD
index a2aa1779e..fb0b1de1b 100644
--- a/user/aspell-dict-gv/APKBUILD
+++ b/user/aspell-dict-gv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-gv
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-he/APKBUILD b/user/aspell-dict-he/APKBUILD
index 99166d52a..90f066246 100644
--- a/user/aspell-dict-he/APKBUILD
+++ b/user/aspell-dict-he/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-he
pkgver=1.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hi/APKBUILD b/user/aspell-dict-hi/APKBUILD
index 26223d8df..8034e9e70 100644
--- a/user/aspell-dict-hi/APKBUILD
+++ b/user/aspell-dict-hi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hi
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hil/APKBUILD b/user/aspell-dict-hil/APKBUILD
index bc4d3af07..f10b6053c 100644
--- a/user/aspell-dict-hil/APKBUILD
+++ b/user/aspell-dict-hil/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hil
pkgver=0.11.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hr/APKBUILD b/user/aspell-dict-hr/APKBUILD
index 917f599cb..8efee0075 100644
--- a/user/aspell-dict-hr/APKBUILD
+++ b/user/aspell-dict-hr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hr
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hsb/APKBUILD b/user/aspell-dict-hsb/APKBUILD
index 95fc32a90..234175a7b 100644
--- a/user/aspell-dict-hsb/APKBUILD
+++ b/user/aspell-dict-hsb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hsb
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hu/APKBUILD b/user/aspell-dict-hu/APKBUILD
index 690fa6841..e956dd716 100644
--- a/user/aspell-dict-hu/APKBUILD
+++ b/user/aspell-dict-hu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hu
pkgver=0.99.4.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.*.}
diff --git a/user/aspell-dict-hus/APKBUILD b/user/aspell-dict-hus/APKBUILD
index 892165847..4c43b843a 100644
--- a/user/aspell-dict-hus/APKBUILD
+++ b/user/aspell-dict-hus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hus
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-hy/APKBUILD b/user/aspell-dict-hy/APKBUILD
index 6cd26a147..0b591bc67 100644
--- a/user/aspell-dict-hy/APKBUILD
+++ b/user/aspell-dict-hy/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-hy
pkgver=0.10.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-ia/APKBUILD b/user/aspell-dict-ia/APKBUILD
index 722c08f15..5f16fa22b 100644
--- a/user/aspell-dict-ia/APKBUILD
+++ b/user/aspell-dict-ia/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ia
pkgver=0.50.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-id/APKBUILD b/user/aspell-dict-id/APKBUILD
index cda3e6217..2cc616082 100644
--- a/user/aspell-dict-id/APKBUILD
+++ b/user/aspell-dict-id/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-id
pkgver=1.2.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-is/APKBUILD b/user/aspell-dict-is/APKBUILD
index 1bdaab2f5..34d71618f 100644
--- a/user/aspell-dict-is/APKBUILD
+++ b/user/aspell-dict-is/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-is
pkgver=0.51.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-it/APKBUILD b/user/aspell-dict-it/APKBUILD
index 639d81c27..ee451b96d 100644
--- a/user/aspell-dict-it/APKBUILD
+++ b/user/aspell-dict-it/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-it
pkgver=2.4.20070901.0
_pkgver=${pkgver%.*.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-kn/APKBUILD b/user/aspell-dict-kn/APKBUILD
index 560e222c3..df1113672 100644
--- a/user/aspell-dict-kn/APKBUILD
+++ b/user/aspell-dict-kn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-kn
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ku/APKBUILD b/user/aspell-dict-ku/APKBUILD
index 5770b2ebb..1d9766fb4 100644
--- a/user/aspell-dict-ku/APKBUILD
+++ b/user/aspell-dict-ku/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ku
pkgver=0.20.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ky/APKBUILD b/user/aspell-dict-ky/APKBUILD
index 86cb8c757..f6103f21c 100644
--- a/user/aspell-dict-ky/APKBUILD
+++ b/user/aspell-dict-ky/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ky
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-la/APKBUILD b/user/aspell-dict-la/APKBUILD
index b2d3473b0..dc05e9ceb 100644
--- a/user/aspell-dict-la/APKBUILD
+++ b/user/aspell-dict-la/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-la
pkgver=20020503.0
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-lt/APKBUILD b/user/aspell-dict-lt/APKBUILD
index 8d31a0a30..da4d661f6 100644
--- a/user/aspell-dict-lt/APKBUILD
+++ b/user/aspell-dict-lt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-lt
pkgver=1.3
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-lv/APKBUILD b/user/aspell-dict-lv/APKBUILD
index bd102c589..59fbd428d 100644
--- a/user/aspell-dict-lv/APKBUILD
+++ b/user/aspell-dict-lv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-lv
pkgver=0.5.5.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-mg/APKBUILD b/user/aspell-dict-mg/APKBUILD
index 0a1963250..3ef16f39c 100644
--- a/user/aspell-dict-mg/APKBUILD
+++ b/user/aspell-dict-mg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mg
pkgver=0.03.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mi/APKBUILD b/user/aspell-dict-mi/APKBUILD
index dbcd853e0..d969c7949 100644
--- a/user/aspell-dict-mi/APKBUILD
+++ b/user/aspell-dict-mi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mi
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mk/APKBUILD b/user/aspell-dict-mk/APKBUILD
index f620067e3..05e515160 100644
--- a/user/aspell-dict-mk/APKBUILD
+++ b/user/aspell-dict-mk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mk
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ml/APKBUILD b/user/aspell-dict-ml/APKBUILD
index 8cd3ee5fc..6e73e29bb 100644
--- a/user/aspell-dict-ml/APKBUILD
+++ b/user/aspell-dict-ml/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ml
pkgver=0.04.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mn/APKBUILD b/user/aspell-dict-mn/APKBUILD
index cbaad148f..42d1f0b8e 100644
--- a/user/aspell-dict-mn/APKBUILD
+++ b/user/aspell-dict-mn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mn
pkgver=0.06.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mr/APKBUILD b/user/aspell-dict-mr/APKBUILD
index 029d4001a..1c4bdca48 100644
--- a/user/aspell-dict-mr/APKBUILD
+++ b/user/aspell-dict-mr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mr
pkgver=0.10.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ms/APKBUILD b/user/aspell-dict-ms/APKBUILD
index a8187eb00..78943bac5 100644
--- a/user/aspell-dict-ms/APKBUILD
+++ b/user/aspell-dict-ms/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ms
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-mt/APKBUILD b/user/aspell-dict-mt/APKBUILD
index e7c3cef1c..574988a43 100644
--- a/user/aspell-dict-mt/APKBUILD
+++ b/user/aspell-dict-mt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-mt
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nb/APKBUILD b/user/aspell-dict-nb/APKBUILD
index 7dd694e35..88d69bdad 100644
--- a/user/aspell-dict-nb/APKBUILD
+++ b/user/aspell-dict-nb/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nb
pkgver=0.50.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-nds/APKBUILD b/user/aspell-dict-nds/APKBUILD
index 688ce1c4e..02dbb06a7 100644
--- a/user/aspell-dict-nds/APKBUILD
+++ b/user/aspell-dict-nds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nds
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nl/APKBUILD b/user/aspell-dict-nl/APKBUILD
index 3d288aa76..b5f66c385 100644
--- a/user/aspell-dict-nl/APKBUILD
+++ b/user/aspell-dict-nl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nl
pkgver=0.50.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-nn/APKBUILD b/user/aspell-dict-nn/APKBUILD
index 14be7c042..9596f6a96 100644
--- a/user/aspell-dict-nn/APKBUILD
+++ b/user/aspell-dict-nn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-nn
pkgver=0.50.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-ny/APKBUILD b/user/aspell-dict-ny/APKBUILD
index 258dcd0a7..6ca3143a3 100644
--- a/user/aspell-dict-ny/APKBUILD
+++ b/user/aspell-dict-ny/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ny
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-or/APKBUILD b/user/aspell-dict-or/APKBUILD
index 97703ffa8..b72d464bc 100644
--- a/user/aspell-dict-or/APKBUILD
+++ b/user/aspell-dict-or/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-or
pkgver=0.03.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-pa/APKBUILD b/user/aspell-dict-pa/APKBUILD
index 83d4ae61f..f696bf819 100644
--- a/user/aspell-dict-pa/APKBUILD
+++ b/user/aspell-dict-pa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pa
pkgver=0.01.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-pl/APKBUILD b/user/aspell-dict-pl/APKBUILD
index e7c364f02..64d36f2a7 100644
--- a/user/aspell-dict-pl/APKBUILD
+++ b/user/aspell-dict-pl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pl
pkgver=20190107
pkgrel=0
diff --git a/user/aspell-dict-pt_BR/APKBUILD b/user/aspell-dict-pt_BR/APKBUILD
index 5ac5dc4e8..c4d7fa5b2 100644
--- a/user/aspell-dict-pt_BR/APKBUILD
+++ b/user/aspell-dict-pt_BR/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pt_BR
pkgver=20090702.0
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-pt_PT/APKBUILD b/user/aspell-dict-pt_PT/APKBUILD
index 72c92641b..006d16247 100644
--- a/user/aspell-dict-pt_PT/APKBUILD
+++ b/user/aspell-dict-pt_PT/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-pt_PT
pkgver=20070510.0
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-qu/APKBUILD b/user/aspell-dict-qu/APKBUILD
index 4641181d7..05ce196e2 100644
--- a/user/aspell-dict-qu/APKBUILD
+++ b/user/aspell-dict-qu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-qu
pkgver=0.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ro/APKBUILD b/user/aspell-dict-ro/APKBUILD
index f80bc913f..a7bf508e2 100644
--- a/user/aspell-dict-ro/APKBUILD
+++ b/user/aspell-dict-ro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ro
pkgver=3.3.10
pkgrel=0
diff --git a/user/aspell-dict-ru/APKBUILD b/user/aspell-dict-ru/APKBUILD
index cd2b6d5f5..bd6291686 100644
--- a/user/aspell-dict-ru/APKBUILD
+++ b/user/aspell-dict-ru/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ru
pkgver=0.99f7.1
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-rw/APKBUILD b/user/aspell-dict-rw/APKBUILD
index accb77d6c..63a9ca275 100644
--- a/user/aspell-dict-rw/APKBUILD
+++ b/user/aspell-dict-rw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-rw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sc/APKBUILD b/user/aspell-dict-sc/APKBUILD
index 8e447c831..9847e11b1 100644
--- a/user/aspell-dict-sc/APKBUILD
+++ b/user/aspell-dict-sc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sc
pkgver=1.0
pkgrel=0
diff --git a/user/aspell-dict-sk/APKBUILD b/user/aspell-dict-sk/APKBUILD
index ac036cc6e..077e9cedb 100644
--- a/user/aspell-dict-sk/APKBUILD
+++ b/user/aspell-dict-sk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sk
pkgver=2.02.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sl/APKBUILD b/user/aspell-dict-sl/APKBUILD
index ab8dc8621..82187792d 100644
--- a/user/aspell-dict-sl/APKBUILD
+++ b/user/aspell-dict-sl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sl
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sr/APKBUILD b/user/aspell-dict-sr/APKBUILD
index 601515fcb..c563bf708 100644
--- a/user/aspell-dict-sr/APKBUILD
+++ b/user/aspell-dict-sr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sr
pkgver=0.02
pkgrel=0
diff --git a/user/aspell-dict-sv/APKBUILD b/user/aspell-dict-sv/APKBUILD
index cbdf4dfc8..5c98db979 100644
--- a/user/aspell-dict-sv/APKBUILD
+++ b/user/aspell-dict-sv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sv
pkgver=0.51.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-sw/APKBUILD b/user/aspell-dict-sw/APKBUILD
index d904ac81a..433f0e556 100644
--- a/user/aspell-dict-sw/APKBUILD
+++ b/user/aspell-dict-sw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-sw
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-ta/APKBUILD b/user/aspell-dict-ta/APKBUILD
index 50cbf030c..9585a9f3b 100644
--- a/user/aspell-dict-ta/APKBUILD
+++ b/user/aspell-dict-ta/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-ta
pkgver=20040424.1
_pkgver=${pkgver%.*}-${pkgver#*.}
diff --git a/user/aspell-dict-te/APKBUILD b/user/aspell-dict-te/APKBUILD
index fbd2bbef9..00f8ea01b 100644
--- a/user/aspell-dict-te/APKBUILD
+++ b/user/aspell-dict-te/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-te
pkgver=0.01.2
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tet/APKBUILD b/user/aspell-dict-tet/APKBUILD
index 392c24a62..30f27ffe5 100644
--- a/user/aspell-dict-tet/APKBUILD
+++ b/user/aspell-dict-tet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tet
pkgver=0.1.1
pkgrel=0
diff --git a/user/aspell-dict-tk/APKBUILD b/user/aspell-dict-tk/APKBUILD
index f02b20fd0..fc8d1f494 100644
--- a/user/aspell-dict-tk/APKBUILD
+++ b/user/aspell-dict-tk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tk
pkgver=0.01.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tl/APKBUILD b/user/aspell-dict-tl/APKBUILD
index fefaf89ff..198560b7f 100644
--- a/user/aspell-dict-tl/APKBUILD
+++ b/user/aspell-dict-tl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tl
pkgver=0.4.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-tn/APKBUILD b/user/aspell-dict-tn/APKBUILD
index 4a404b4da..4e135c3b0 100644
--- a/user/aspell-dict-tn/APKBUILD
+++ b/user/aspell-dict-tn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tn
pkgver=1.0.1.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-tr/APKBUILD b/user/aspell-dict-tr/APKBUILD
index 6e32881a1..4778329f2 100644
--- a/user/aspell-dict-tr/APKBUILD
+++ b/user/aspell-dict-tr/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-tr
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-uk/APKBUILD b/user/aspell-dict-uk/APKBUILD
index d812753ad..9b2fa8a04 100644
--- a/user/aspell-dict-uk/APKBUILD
+++ b/user/aspell-dict-uk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-uk
pkgver=1.4.0.0
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-uz/APKBUILD b/user/aspell-dict-uz/APKBUILD
index cc9e0b28a..85c49eb49 100644
--- a/user/aspell-dict-uz/APKBUILD
+++ b/user/aspell-dict-uz/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-uz
pkgver=0.6.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-vi/APKBUILD b/user/aspell-dict-vi/APKBUILD
index 12a23ae79..0c0deb6b0 100644
--- a/user/aspell-dict-vi/APKBUILD
+++ b/user/aspell-dict-vi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-vi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-wa/APKBUILD b/user/aspell-dict-wa/APKBUILD
index 35ed79b6b..52640fc6d 100644
--- a/user/aspell-dict-wa/APKBUILD
+++ b/user/aspell-dict-wa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-wa
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/aspell-dict-yi/APKBUILD b/user/aspell-dict-yi/APKBUILD
index f3b55aaaa..9038b7f1d 100644
--- a/user/aspell-dict-yi/APKBUILD
+++ b/user/aspell-dict-yi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-yi
pkgver=0.01.1.1
_pkgver=${pkgver%.*}-${pkgver#*.*.*.}
diff --git a/user/aspell-dict-zu/APKBUILD b/user/aspell-dict-zu/APKBUILD
index 6beb5fb89..18a84740d 100644
--- a/user/aspell-dict-zu/APKBUILD
+++ b/user/aspell-dict-zu/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=aspell-dict-zu
pkgver=0.50.0
_pkgver=${pkgver%.*}-${pkgver#*.*.}
diff --git a/user/atkmm/APKBUILD b/user/atkmm/APKBUILD
index cbf9d21de..4e8820bd9 100644
--- a/user/atkmm/APKBUILD
+++ b/user/atkmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=atkmm
pkgver=2.28.0
pkgrel=0
diff --git a/user/atril/APKBUILD b/user/atril/APKBUILD
index d36e45f69..259df376d 100644
--- a/user/atril/APKBUILD
+++ b/user/atril/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=atril
pkgver=1.22.2
pkgrel=0
diff --git a/user/ayatana-ido/APKBUILD b/user/ayatana-ido/APKBUILD
index dea352c42..dbc939270 100644
--- a/user/ayatana-ido/APKBUILD
+++ b/user/ayatana-ido/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ayatana-ido
pkgver=0.4.4
pkgrel=0
diff --git a/user/bash-completion/APKBUILD b/user/bash-completion/APKBUILD
index 535db976b..196cdb2b4 100644
--- a/user/bash-completion/APKBUILD
+++ b/user/bash-completion/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Contributor: zlg <zlg+adelie@zlg.space>
# Maintainer:
pkgname=bash-completion
diff --git a/user/bitlbee/APKBUILD b/user/bitlbee/APKBUILD
index c61c98095..91e613b4e 100644
--- a/user/bitlbee/APKBUILD
+++ b/user/bitlbee/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=bitlbee
pkgver=3.5.1
pkgrel=0
diff --git a/user/cairomm/APKBUILD b/user/cairomm/APKBUILD
index f79d27580..06626cceb 100644
--- a/user/cairomm/APKBUILD
+++ b/user/cairomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cairomm
pkgver=1.12.2
pkgrel=0
diff --git a/user/caja-dropbox/APKBUILD b/user/caja-dropbox/APKBUILD
index 938d76160..12cb97695 100644
--- a/user/caja-dropbox/APKBUILD
+++ b/user/caja-dropbox/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja-dropbox
pkgver=1.22.1
pkgrel=0
diff --git a/user/caja-extensions/APKBUILD b/user/caja-extensions/APKBUILD
index 6eadf0f67..f91fe340d 100644
--- a/user/caja-extensions/APKBUILD
+++ b/user/caja-extensions/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja-extensions
pkgver=1.22.1
pkgrel=0
diff --git a/user/caja/APKBUILD b/user/caja/APKBUILD
index a4ffe1c01..2335ac681 100644
--- a/user/caja/APKBUILD
+++ b/user/caja/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=caja
pkgver=1.22.2
pkgrel=0
diff --git a/user/catfish/APKBUILD b/user/catfish/APKBUILD
index eacc0772b..8f9d8b88a 100644
--- a/user/catfish/APKBUILD
+++ b/user/catfish/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=catfish
pkgver=1.4.10
pkgrel=0
diff --git a/user/cloc/APKBUILD b/user/cloc/APKBUILD
index 86ddd5c59..4b12785f8 100644
--- a/user/cloc/APKBUILD
+++ b/user/cloc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cloc
pkgver=1.84
pkgrel=0
diff --git a/user/clutter/APKBUILD b/user/clutter/APKBUILD
index d2a53b372..e24d60c27 100644
--- a/user/clutter/APKBUILD
+++ b/user/clutter/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=clutter
pkgver=1.26.2
pkgrel=0
diff --git a/user/cogl/APKBUILD b/user/cogl/APKBUILD
index f7e7b699c..900be988e 100644
--- a/user/cogl/APKBUILD
+++ b/user/cogl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=cogl
pkgver=1.22.4
pkgrel=0
diff --git a/user/compton-conf/APKBUILD b/user/compton-conf/APKBUILD
index 1753aff6c..7bf43d6b5 100644
--- a/user/compton-conf/APKBUILD
+++ b/user/compton-conf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=compton-conf
pkgver=0.14.1
pkgrel=0
diff --git a/user/compton/APKBUILD b/user/compton/APKBUILD
index 338f123de..0cfae4b52 100644
--- a/user/compton/APKBUILD
+++ b/user/compton/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=compton
pkgver=4
pkgrel=0
diff --git a/user/dconf/APKBUILD b/user/dconf/APKBUILD
index 88160df56..cb5843f8f 100644
--- a/user/dconf/APKBUILD
+++ b/user/dconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dconf
pkgver=0.34.0
pkgrel=0
diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD
index 628675765..7895b8d1a 100644
--- a/user/dina/APKBUILD
+++ b/user/dina/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=dina
pkgver=2.93
pkgrel=0
diff --git a/user/engrampa/APKBUILD b/user/engrampa/APKBUILD
index a9332f56a..befc809fd 100644
--- a/user/engrampa/APKBUILD
+++ b/user/engrampa/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=engrampa
pkgver=1.22.2
pkgrel=0
diff --git a/user/eom/APKBUILD b/user/eom/APKBUILD
index bc53bc9b7..0d82153d9 100644
--- a/user/eom/APKBUILD
+++ b/user/eom/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=eom
pkgver=1.22.2
pkgrel=0
diff --git a/user/exo/APKBUILD b/user/exo/APKBUILD
index 935b57108..4302bb5f2 100644
--- a/user/exo/APKBUILD
+++ b/user/exo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=exo
pkgver=0.12.9
pkgrel=0
diff --git a/user/featherpad/APKBUILD b/user/featherpad/APKBUILD
index 8df9c0bff..636f2c474 100644
--- a/user/featherpad/APKBUILD
+++ b/user/featherpad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=featherpad
pkgver=0.11.1
pkgrel=0
diff --git a/user/ffmpegthumbnailer/APKBUILD b/user/ffmpegthumbnailer/APKBUILD
index 8a3049363..1eca89231 100644
--- a/user/ffmpegthumbnailer/APKBUILD
+++ b/user/ffmpegthumbnailer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ffmpegthumbnailer
pkgver=2.2.2
pkgrel=0
diff --git a/user/fish/APKBUILD b/user/fish/APKBUILD
index 8c0ff4bc6..271690df5 100644
--- a/user/fish/APKBUILD
+++ b/user/fish/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=fish
pkgver=3.0.2
pkgrel=0
diff --git a/user/flite/APKBUILD b/user/flite/APKBUILD
index 3922e1d88..6818f19ee 100644
--- a/user/flite/APKBUILD
+++ b/user/flite/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=flite
pkgver=2.1
pkgrel=0
diff --git a/user/garcon/APKBUILD b/user/garcon/APKBUILD
index c712903ee..235513fce 100644
--- a/user/garcon/APKBUILD
+++ b/user/garcon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=garcon
pkgver=0.6.4
pkgrel=0
diff --git a/user/gleam/APKBUILD b/user/gleam/APKBUILD
index cc931ea0c..b9cdc482a 100644
--- a/user/gleam/APKBUILD
+++ b/user/gleam/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gleam
pkgver=0.4.2
pkgrel=0
diff --git a/user/glibmm/APKBUILD b/user/glibmm/APKBUILD
index a0bac403d..f499efc9d 100644
--- a/user/glibmm/APKBUILD
+++ b/user/glibmm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=glibmm
pkgver=2.62.0
pkgrel=0
diff --git a/user/gtkmm+3.0/APKBUILD b/user/gtkmm+3.0/APKBUILD
index edc9466a4..0dbcf4f38 100644
--- a/user/gtkmm+3.0/APKBUILD
+++ b/user/gtkmm+3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gtkmm+3.0
pkgver=3.24.2
pkgrel=0
diff --git a/user/gtksourceview-3.0/APKBUILD b/user/gtksourceview-3.0/APKBUILD
index 23f34a3c2..94fe8ad51 100644
--- a/user/gtksourceview-3.0/APKBUILD
+++ b/user/gtksourceview-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gtksourceview-3.0
pkgver=3.24.11
pkgrel=0
diff --git a/user/gucharmap/APKBUILD b/user/gucharmap/APKBUILD
index 9a3d7bfcf..913d4f749 100644
--- a/user/gucharmap/APKBUILD
+++ b/user/gucharmap/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gucharmap
pkgver=12.0.1
_unicode=12.0.0
diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD
index 165e6798a..9b2a0c17e 100644
--- a/user/gvim/APKBUILD
+++ b/user/gvim/APKBUILD
@@ -2,7 +2,7 @@
# Contributor: Łukasz Jendrysik <scadu@yandex.com>
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=gvim
_pkgreal=vim
pkgver=8.1.2311
diff --git a/user/icewm/APKBUILD b/user/icewm/APKBUILD
index d57231f43..411207a14 100644
--- a/user/icewm/APKBUILD
+++ b/user/icewm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=icewm
pkgver=1.5.5
pkgrel=0
diff --git a/user/ido/APKBUILD b/user/ido/APKBUILD
index 9f858605e..9925e1453 100644
--- a/user/ido/APKBUILD
+++ b/user/ido/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ido
pkgver=12.10.2
pkgrel=0
diff --git a/user/irssi/APKBUILD b/user/irssi/APKBUILD
index 1d63fd4b2..2a89e8d9b 100644
--- a/user/irssi/APKBUILD
+++ b/user/irssi/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=irssi
pkgver=1.2.2
pkgrel=0
diff --git a/user/json-glib/APKBUILD b/user/json-glib/APKBUILD
index a297939df..bf5e2904d 100644
--- a/user/json-glib/APKBUILD
+++ b/user/json-glib/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=json-glib
pkgver=1.4.4
pkgrel=0
diff --git a/user/keybinder-3.0/APKBUILD b/user/keybinder-3.0/APKBUILD
index 8340209fb..54c82d864 100644
--- a/user/keybinder-3.0/APKBUILD
+++ b/user/keybinder-3.0/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=keybinder-3.0
pkgver=0.3.2
pkgrel=0
diff --git a/user/libass/APKBUILD b/user/libass/APKBUILD
index 3b9b22908..1301b809f 100644
--- a/user/libass/APKBUILD
+++ b/user/libass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libass
pkgver=0.14.0
pkgrel=0
diff --git a/user/libayatana-indicator/APKBUILD b/user/libayatana-indicator/APKBUILD
index 4372a2b44..69f66fe35 100644
--- a/user/libayatana-indicator/APKBUILD
+++ b/user/libayatana-indicator/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libayatana-indicator
pkgver=0.6.2
pkgrel=0
diff --git a/user/libburn/APKBUILD b/user/libburn/APKBUILD
index 254c2ea90..6a8bde34b 100644
--- a/user/libburn/APKBUILD
+++ b/user/libburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libburn
pkgver=1.5.2
pkgrel=0
diff --git a/user/libfakekey/APKBUILD b/user/libfakekey/APKBUILD
index d8221c552..decd8540e 100644
--- a/user/libfakekey/APKBUILD
+++ b/user/libfakekey/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libfakekey
pkgver=0.3
pkgrel=0
diff --git a/user/libfm-qt/APKBUILD b/user/libfm-qt/APKBUILD
index 5412fccfc..61264a8fe 100644
--- a/user/libfm-qt/APKBUILD
+++ b/user/libfm-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libfm-qt
pkgver=0.14.1
pkgrel=0
diff --git a/user/libglade/APKBUILD b/user/libglade/APKBUILD
index 97d20f603..584e9d9c3 100644
--- a/user/libglade/APKBUILD
+++ b/user/libglade/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libglade
pkgver=2.6.4
pkgrel=0
diff --git a/user/libgnome-keyring/APKBUILD b/user/libgnome-keyring/APKBUILD
index 030194fc5..7f7daf3d8 100644
--- a/user/libgnome-keyring/APKBUILD
+++ b/user/libgnome-keyring/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libgnome-keyring
pkgver=3.12.0
pkgrel=0
diff --git a/user/libgtop/APKBUILD b/user/libgtop/APKBUILD
index ea17925e3..9c1fa582a 100644
--- a/user/libgtop/APKBUILD
+++ b/user/libgtop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libgtop
pkgver=2.40.0
pkgrel=0
diff --git a/user/libindicator/APKBUILD b/user/libindicator/APKBUILD
index 8bae4ffde..9d1c866f3 100644
--- a/user/libindicator/APKBUILD
+++ b/user/libindicator/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libindicator
pkgver=12.10.1
pkgrel=0
diff --git a/user/libisofs/APKBUILD b/user/libisofs/APKBUILD
index 7a43b027f..5020a072d 100644
--- a/user/libisofs/APKBUILD
+++ b/user/libisofs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libisofs
pkgver=1.5.2
pkgrel=0
diff --git a/user/liblxqt/APKBUILD b/user/liblxqt/APKBUILD
index 24765e4fc..925d03c0b 100644
--- a/user/liblxqt/APKBUILD
+++ b/user/liblxqt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=liblxqt
pkgver=0.14.1
pkgrel=0
diff --git a/user/libmatekbd/APKBUILD b/user/libmatekbd/APKBUILD
index f7ea8d723..dc4de5bcc 100644
--- a/user/libmatekbd/APKBUILD
+++ b/user/libmatekbd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmatekbd
pkgver=1.22.0
pkgrel=0
diff --git a/user/libmatemixer/APKBUILD b/user/libmatemixer/APKBUILD
index a3b1fc797..f04fa71bd 100644
--- a/user/libmatemixer/APKBUILD
+++ b/user/libmatemixer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmatemixer
pkgver=1.22.0
pkgrel=0
diff --git a/user/libmateweather/APKBUILD b/user/libmateweather/APKBUILD
index da65670d9..f0fb42c54 100644
--- a/user/libmateweather/APKBUILD
+++ b/user/libmateweather/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmateweather
pkgver=1.22.1
pkgrel=0
diff --git a/user/libmpd/APKBUILD b/user/libmpd/APKBUILD
index c3ae2be64..9e1aedb1f 100644
--- a/user/libmpd/APKBUILD
+++ b/user/libmpd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libmpd
pkgver=11.8.17
pkgrel=0
diff --git a/user/libopenraw/APKBUILD b/user/libopenraw/APKBUILD
index b29becc3f..2e701fc57 100644
--- a/user/libopenraw/APKBUILD
+++ b/user/libopenraw/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libopenraw
pkgver=0.1.3
pkgrel=0
diff --git a/user/libpeas/APKBUILD b/user/libpeas/APKBUILD
index 09d588dcd..9c517e05f 100644
--- a/user/libpeas/APKBUILD
+++ b/user/libpeas/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libpeas
pkgver=1.24.1
pkgrel=0
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 38ba69198..08c8fccf4 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libpsl
pkgver=0.21.0
pkgrel=0
diff --git a/user/libqtxdg/APKBUILD b/user/libqtxdg/APKBUILD
index 829bef03c..8f9f29fa1 100644
--- a/user/libqtxdg/APKBUILD
+++ b/user/libqtxdg/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libqtxdg
pkgver=3.4.0
pkgrel=0
diff --git a/user/libsigc++/APKBUILD b/user/libsigc++/APKBUILD
index 3e0bf669c..1904734fe 100644
--- a/user/libsigc++/APKBUILD
+++ b/user/libsigc++/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsigc++
pkgver=2.10.2
pkgrel=0
diff --git a/user/libsoup/APKBUILD b/user/libsoup/APKBUILD
index f334b02ec..3889d221d 100644
--- a/user/libsoup/APKBUILD
+++ b/user/libsoup/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsoup
pkgver=2.68.2
pkgrel=0
diff --git a/user/libstatgrab/APKBUILD b/user/libstatgrab/APKBUILD
index a1a24c35b..09deb09b9 100644
--- a/user/libstatgrab/APKBUILD
+++ b/user/libstatgrab/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libstatgrab
pkgver=0.92
pkgrel=0
diff --git a/user/libsysstat/APKBUILD b/user/libsysstat/APKBUILD
index 3bf73d5d6..c7bccafc6 100644
--- a/user/libsysstat/APKBUILD
+++ b/user/libsysstat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libsysstat
pkgver=0.4.2
pkgrel=0
diff --git a/user/libwebp/APKBUILD b/user/libwebp/APKBUILD
index 93ef7b9dd..991381953 100644
--- a/user/libwebp/APKBUILD
+++ b/user/libwebp/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer:
pkgname=libwebp
pkgver=1.0.3
diff --git a/user/libwnck/APKBUILD b/user/libwnck/APKBUILD
index 2c7bc1b78..95faa5539 100644
--- a/user/libwnck/APKBUILD
+++ b/user/libwnck/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libwnck
pkgver=3.32.0
_pkgmaj=${pkgver%.*}
diff --git a/user/libxfce4ui/APKBUILD b/user/libxfce4ui/APKBUILD
index 561c84bcf..654e625e3 100644
--- a/user/libxfce4ui/APKBUILD
+++ b/user/libxfce4ui/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxfce4ui
pkgver=4.14.1
pkgrel=0
diff --git a/user/libxfce4util/APKBUILD b/user/libxfce4util/APKBUILD
index 8e8bcb8aa..06f02916e 100644
--- a/user/libxfce4util/APKBUILD
+++ b/user/libxfce4util/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxfce4util
pkgver=4.14.0
pkgrel=0
diff --git a/user/libxklavier/APKBUILD b/user/libxklavier/APKBUILD
index e1addd860..3b8662b0c 100644
--- a/user/libxklavier/APKBUILD
+++ b/user/libxklavier/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=libxklavier
pkgver=5.4
pkgrel=1
diff --git a/user/lua-expat/APKBUILD b/user/lua-expat/APKBUILD
index 9c8a6713a..9b6295bc1 100644
--- a/user/lua-expat/APKBUILD
+++ b/user/lua-expat/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contribtor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-expat
_name=expat
pkgver=1.3.0
diff --git a/user/lua-filesystem/APKBUILD b/user/lua-filesystem/APKBUILD
index e0deea91a..f244b935d 100644
--- a/user/lua-filesystem/APKBUILD
+++ b/user/lua-filesystem/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-filesystem
_pkgname=luafilesystem
pkgver=1.7.0.2
diff --git a/user/lua-socket/APKBUILD b/user/lua-socket/APKBUILD
index 89cbd7447..645cef44a 100644
--- a/user/lua-socket/APKBUILD
+++ b/user/lua-socket/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lua-socket
_name=luasocket
pkgver=3.0_rc1_git20160306
diff --git a/user/luarocks/APKBUILD b/user/luarocks/APKBUILD
index dbceb82e5..42695a0ef 100644
--- a/user/luarocks/APKBUILD
+++ b/user/luarocks/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=luarocks
pkgver=3.2.1
pkgrel=0
diff --git a/user/lximage-qt/APKBUILD b/user/lximage-qt/APKBUILD
index 41752c57a..41aaee8c1 100644
--- a/user/lximage-qt/APKBUILD
+++ b/user/lximage-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lximage-qt
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxmenu-data/APKBUILD b/user/lxmenu-data/APKBUILD
index 846d44da3..ddb05161b 100644
--- a/user/lxmenu-data/APKBUILD
+++ b/user/lxmenu-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxmenu-data
pkgver=0.1.5
pkgrel=1
diff --git a/user/lxqt-about/APKBUILD b/user/lxqt-about/APKBUILD
index 8a6f865c9..3cc69d071 100644
--- a/user/lxqt-about/APKBUILD
+++ b/user/lxqt-about/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-about
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-admin/APKBUILD b/user/lxqt-admin/APKBUILD
index 2dc1b1db3..36ce2fe7c 100644
--- a/user/lxqt-admin/APKBUILD
+++ b/user/lxqt-admin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-admin
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-build-tools/APKBUILD b/user/lxqt-build-tools/APKBUILD
index 1447fdee0..66a6285a0 100644
--- a/user/lxqt-build-tools/APKBUILD
+++ b/user/lxqt-build-tools/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-build-tools
pkgver=0.6.0
pkgrel=0
diff --git a/user/lxqt-config/APKBUILD b/user/lxqt-config/APKBUILD
index 0198540b4..7f29e3e72 100644
--- a/user/lxqt-config/APKBUILD
+++ b/user/lxqt-config/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-config
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD
index a49fea8d7..1ed4bb588 100644
--- a/user/lxqt-desktop/APKBUILD
+++ b/user/lxqt-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-desktop
pkgver=0.13.0
pkgrel=1
diff --git a/user/lxqt-globalkeys/APKBUILD b/user/lxqt-globalkeys/APKBUILD
index 379de923d..fbb90ad8d 100644
--- a/user/lxqt-globalkeys/APKBUILD
+++ b/user/lxqt-globalkeys/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-globalkeys
pkgver=0.14.3
pkgrel=0
diff --git a/user/lxqt-l10n/APKBUILD b/user/lxqt-l10n/APKBUILD
index cc60400d1..bba40dc92 100644
--- a/user/lxqt-l10n/APKBUILD
+++ b/user/lxqt-l10n/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-l10n
pkgver=0.13.0
pkgrel=1
diff --git a/user/lxqt-notificationd/APKBUILD b/user/lxqt-notificationd/APKBUILD
index 76bf8585f..3afe1be5b 100644
--- a/user/lxqt-notificationd/APKBUILD
+++ b/user/lxqt-notificationd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-notificationd
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-openssh-askpass/APKBUILD b/user/lxqt-openssh-askpass/APKBUILD
index b45edca56..0312e7588 100644
--- a/user/lxqt-openssh-askpass/APKBUILD
+++ b/user/lxqt-openssh-askpass/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-openssh-askpass
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-panel/APKBUILD b/user/lxqt-panel/APKBUILD
index 2dfef7350..934554989 100644
--- a/user/lxqt-panel/APKBUILD
+++ b/user/lxqt-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-panel
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-policykit/APKBUILD b/user/lxqt-policykit/APKBUILD
index d940b6d52..a1a1bd77e 100644
--- a/user/lxqt-policykit/APKBUILD
+++ b/user/lxqt-policykit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-policykit
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-powermanagement/APKBUILD b/user/lxqt-powermanagement/APKBUILD
index 68907d723..89dd7b153 100644
--- a/user/lxqt-powermanagement/APKBUILD
+++ b/user/lxqt-powermanagement/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-powermanagement
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-qtplugin/APKBUILD b/user/lxqt-qtplugin/APKBUILD
index ae0a30b03..98aaa19cf 100644
--- a/user/lxqt-qtplugin/APKBUILD
+++ b/user/lxqt-qtplugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-qtplugin
pkgver=0.14.0
pkgrel=0
diff --git a/user/lxqt-runner/APKBUILD b/user/lxqt-runner/APKBUILD
index d44d72c1e..3bb5b635f 100644
--- a/user/lxqt-runner/APKBUILD
+++ b/user/lxqt-runner/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-runner
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-session/APKBUILD b/user/lxqt-session/APKBUILD
index 0b960dee0..e3a44a552 100644
--- a/user/lxqt-session/APKBUILD
+++ b/user/lxqt-session/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-session
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-sudo/APKBUILD b/user/lxqt-sudo/APKBUILD
index 5a15a9cfb..d8b6904db 100644
--- a/user/lxqt-sudo/APKBUILD
+++ b/user/lxqt-sudo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-sudo
pkgver=0.14.1
pkgrel=0
diff --git a/user/lxqt-themes/APKBUILD b/user/lxqt-themes/APKBUILD
index 233511d95..beb54e53d 100644
--- a/user/lxqt-themes/APKBUILD
+++ b/user/lxqt-themes/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lxqt-themes
pkgver=0.14.0
pkgrel=0
diff --git a/user/lynx/APKBUILD b/user/lynx/APKBUILD
index 70fb32c0c..4bd75c160 100644
--- a/user/lynx/APKBUILD
+++ b/user/lynx/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=lynx
pkgver=2.8.9_p1
_relver="${pkgver%_p*}rel.${pkgver#*_p}"
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index c227e07b1..0539df36a 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=marco
pkgver=1.22.3
pkgrel=0
diff --git a/user/mate-applets/APKBUILD b/user/mate-applets/APKBUILD
index e3eb7c72d..e8781f776 100644
--- a/user/mate-applets/APKBUILD
+++ b/user/mate-applets/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-applets
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-backgrounds/APKBUILD b/user/mate-backgrounds/APKBUILD
index bd70d43a8..0b785d711 100644
--- a/user/mate-backgrounds/APKBUILD
+++ b/user/mate-backgrounds/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-backgrounds
pkgver=1.22.0
pkgrel=0
diff --git a/user/mate-calc/APKBUILD b/user/mate-calc/APKBUILD
index 0a0d5c90f..2e640c8c9 100644
--- a/user/mate-calc/APKBUILD
+++ b/user/mate-calc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-calc
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-common/APKBUILD b/user/mate-common/APKBUILD
index e84227d22..d1186169e 100644
--- a/user/mate-common/APKBUILD
+++ b/user/mate-common/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-common
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-complete/APKBUILD b/user/mate-complete/APKBUILD
index f3a5ac75a..ec770dd97 100644
--- a/user/mate-complete/APKBUILD
+++ b/user/mate-complete/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-complete
pkgver=1.22.0
pkgrel=0
diff --git a/user/mate-control-center/APKBUILD b/user/mate-control-center/APKBUILD
index c65bae49d..80a1545e6 100644
--- a/user/mate-control-center/APKBUILD
+++ b/user/mate-control-center/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-control-center
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-desktop/APKBUILD b/user/mate-desktop/APKBUILD
index b88573a5f..e56d5bf32 100644
--- a/user/mate-desktop/APKBUILD
+++ b/user/mate-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-desktop
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-icon-theme/APKBUILD b/user/mate-icon-theme/APKBUILD
index 424ac19ed..7e6aece6f 100644
--- a/user/mate-icon-theme/APKBUILD
+++ b/user/mate-icon-theme/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-icon-theme
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-indicator-applet/APKBUILD b/user/mate-indicator-applet/APKBUILD
index 1988c358a..434d9c1c8 100644
--- a/user/mate-indicator-applet/APKBUILD
+++ b/user/mate-indicator-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-indicator-applet
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-media/APKBUILD b/user/mate-media/APKBUILD
index 11d43613a..b880f164f 100644
--- a/user/mate-media/APKBUILD
+++ b/user/mate-media/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-media
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-menus/APKBUILD b/user/mate-menus/APKBUILD
index d2d6d33d5..6b04f7d77 100644
--- a/user/mate-menus/APKBUILD
+++ b/user/mate-menus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-menus
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-netbook/APKBUILD b/user/mate-netbook/APKBUILD
index 381e9d991..42fab1202 100644
--- a/user/mate-netbook/APKBUILD
+++ b/user/mate-netbook/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-netbook
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-notification-daemon/APKBUILD b/user/mate-notification-daemon/APKBUILD
index d3a0235c7..b8df2f196 100644
--- a/user/mate-notification-daemon/APKBUILD
+++ b/user/mate-notification-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-notification-daemon
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-panel/APKBUILD b/user/mate-panel/APKBUILD
index 36cbb8c84..897cd426a 100644
--- a/user/mate-panel/APKBUILD
+++ b/user/mate-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-panel
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-polkit/APKBUILD b/user/mate-polkit/APKBUILD
index 345159cbc..7ae348db9 100644
--- a/user/mate-polkit/APKBUILD
+++ b/user/mate-polkit/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-polkit
pkgver=1.22.0
pkgrel=0
diff --git a/user/mate-power-manager/APKBUILD b/user/mate-power-manager/APKBUILD
index 56d13b5c1..2edce231d 100644
--- a/user/mate-power-manager/APKBUILD
+++ b/user/mate-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-power-manager
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-screensaver/APKBUILD b/user/mate-screensaver/APKBUILD
index 1fd702a93..a02727973 100644
--- a/user/mate-screensaver/APKBUILD
+++ b/user/mate-screensaver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-screensaver
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-sensors-applet/APKBUILD b/user/mate-sensors-applet/APKBUILD
index fcb3ebb96..17e08c634 100644
--- a/user/mate-sensors-applet/APKBUILD
+++ b/user/mate-sensors-applet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-sensors-applet
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-session-manager/APKBUILD b/user/mate-session-manager/APKBUILD
index a7c5baaea..b11e15208 100644
--- a/user/mate-session-manager/APKBUILD
+++ b/user/mate-session-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-session-manager
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-settings-daemon/APKBUILD b/user/mate-settings-daemon/APKBUILD
index fb99c523e..88f858ed8 100644
--- a/user/mate-settings-daemon/APKBUILD
+++ b/user/mate-settings-daemon/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-settings-daemon
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-system-monitor/APKBUILD b/user/mate-system-monitor/APKBUILD
index 78b1b08c8..4bc298b79 100644
--- a/user/mate-system-monitor/APKBUILD
+++ b/user/mate-system-monitor/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-system-monitor
pkgver=1.22.2
pkgrel=0
diff --git a/user/mate-terminal/APKBUILD b/user/mate-terminal/APKBUILD
index 02da7e5b3..6a7da0691 100644
--- a/user/mate-terminal/APKBUILD
+++ b/user/mate-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-terminal
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-user-guide/APKBUILD b/user/mate-user-guide/APKBUILD
index 1f8f61ef6..546c91d54 100644
--- a/user/mate-user-guide/APKBUILD
+++ b/user/mate-user-guide/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-user-guide
pkgver=1.22.3
pkgrel=0
diff --git a/user/mate-user-share/APKBUILD b/user/mate-user-share/APKBUILD
index b519c9701..9b540a3df 100644
--- a/user/mate-user-share/APKBUILD
+++ b/user/mate-user-share/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-user-share
pkgver=1.22.1
pkgrel=0
diff --git a/user/mate-utils/APKBUILD b/user/mate-utils/APKBUILD
index 0a8677b18..f62713869 100644
--- a/user/mate-utils/APKBUILD
+++ b/user/mate-utils/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mate-utils
pkgver=1.22.2
pkgrel=0
diff --git a/user/mimetic/APKBUILD b/user/mimetic/APKBUILD
index c69f27270..058a8d91e 100644
--- a/user/mimetic/APKBUILD
+++ b/user/mimetic/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mimetic
pkgver=0.9.8
pkgrel=0
diff --git a/user/mousepad/APKBUILD b/user/mousepad/APKBUILD
index be5799335..8e6461482 100644
--- a/user/mousepad/APKBUILD
+++ b/user/mousepad/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mousepad
pkgver=0.4.2
pkgrel=0
diff --git a/user/mozo/APKBUILD b/user/mozo/APKBUILD
index 2c7c919c4..39e315017 100644
--- a/user/mozo/APKBUILD
+++ b/user/mozo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mozo
pkgver=1.22.2
pkgrel=0
diff --git a/user/mplayer/APKBUILD b/user/mplayer/APKBUILD
index 576de2514..8f703f637 100644
--- a/user/mplayer/APKBUILD
+++ b/user/mplayer/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mplayer
pkgver=1.4
pkgrel=1
diff --git a/user/mpv/APKBUILD b/user/mpv/APKBUILD
index 9c12a7aa6..ba7c54846 100644
--- a/user/mpv/APKBUILD
+++ b/user/mpv/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=mpv
pkgver=0.29.1
pkgrel=2
diff --git a/user/muparser/APKBUILD b/user/muparser/APKBUILD
index f088af0fa..7f3dd35c1 100644
--- a/user/muparser/APKBUILD
+++ b/user/muparser/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=muparser
pkgver=2.2.6.1
pkgrel=0
diff --git a/user/netsurf/APKBUILD b/user/netsurf/APKBUILD
index e6f799627..0c9fc7e8b 100644
--- a/user/netsurf/APKBUILD
+++ b/user/netsurf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=netsurf
pkgver=3.9
pkgrel=0
diff --git a/user/obconf-qt/APKBUILD b/user/obconf-qt/APKBUILD
index c1da38c31..2569121a0 100644
--- a/user/obconf-qt/APKBUILD
+++ b/user/obconf-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=obconf-qt
pkgver=0.14.1
pkgrel=0
diff --git a/user/orage/APKBUILD b/user/orage/APKBUILD
index c64f3c18b..42d97b547 100644
--- a/user/orage/APKBUILD
+++ b/user/orage/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=orage
pkgver=4.12.1
pkgrel=2
diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD
index b67bd4347..08756dcdb 100644
--- a/user/otf-culmus/APKBUILD
+++ b/user/otf-culmus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-culmus
pkgver=0.133
pkgrel=0
diff --git a/user/otf-exo/APKBUILD b/user/otf-exo/APKBUILD
index 939ae229a..87b065000 100644
--- a/user/otf-exo/APKBUILD
+++ b/user/otf-exo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-exo
pkgver=2
pkgrel=0
diff --git a/user/otf-office-code-pro/APKBUILD b/user/otf-office-code-pro/APKBUILD
index 0f34cac2a..47eda62f0 100644
--- a/user/otf-office-code-pro/APKBUILD
+++ b/user/otf-office-code-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-office-code-pro
pkgver=1.004
pkgrel=0
diff --git a/user/otf-proggy-vector/APKBUILD b/user/otf-proggy-vector/APKBUILD
index 3af3cc125..a191366f9 100644
--- a/user/otf-proggy-vector/APKBUILD
+++ b/user/otf-proggy-vector/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-proggy-vector
pkgver=1.1.5
pkgrel=0
diff --git a/user/otf-source-code-pro/APKBUILD b/user/otf-source-code-pro/APKBUILD
index 78e144b82..551a2e1f6 100644
--- a/user/otf-source-code-pro/APKBUILD
+++ b/user/otf-source-code-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-code-pro
pkgver=2.030
_pkgver=1.050
diff --git a/user/otf-source-sans-pro/APKBUILD b/user/otf-source-sans-pro/APKBUILD
index 04581e14c..871760fac 100644
--- a/user/otf-source-sans-pro/APKBUILD
+++ b/user/otf-source-sans-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-sans-pro
pkgver=3.006
pkgrel=0
diff --git a/user/otf-source-serif-pro/APKBUILD b/user/otf-source-serif-pro/APKBUILD
index d4c567d1c..7efafac99 100644
--- a/user/otf-source-serif-pro/APKBUILD
+++ b/user/otf-source-serif-pro/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=otf-source-serif-pro
pkgver=3.001
pkgrel=0
diff --git a/user/pangomm/APKBUILD b/user/pangomm/APKBUILD
index 5b2ddd058..e6d4f77e0 100644
--- a/user/pangomm/APKBUILD
+++ b/user/pangomm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pangomm
pkgver=2.42.0
pkgrel=0
diff --git a/user/parole/APKBUILD b/user/parole/APKBUILD
index 2ffd296e3..5d9ad60cf 100644
--- a/user/parole/APKBUILD
+++ b/user/parole/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=parole
pkgver=1.0.5
pkgrel=0
diff --git a/user/pavucontrol-qt/APKBUILD b/user/pavucontrol-qt/APKBUILD
index 3cbcd2c30..02c13c95f 100644
--- a/user/pavucontrol-qt/APKBUILD
+++ b/user/pavucontrol-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pavucontrol-qt
pkgver=0.14.1
pkgrel=0
diff --git a/user/pavucontrol/APKBUILD b/user/pavucontrol/APKBUILD
index dd02568a7..1c18d17de 100644
--- a/user/pavucontrol/APKBUILD
+++ b/user/pavucontrol/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pavucontrol
pkgver=4.0
pkgrel=0
diff --git a/user/pcmanfm-qt/APKBUILD b/user/pcmanfm-qt/APKBUILD
index 75b042e40..99718723f 100644
--- a/user/pcmanfm-qt/APKBUILD
+++ b/user/pcmanfm-qt/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pcmanfm-qt
pkgver=0.14.1
pkgrel=0
diff --git a/user/pcmanfm/APKBUILD b/user/pcmanfm/APKBUILD
index 8ecf6ba0a..cd4cc7daf 100644
--- a/user/pcmanfm/APKBUILD
+++ b/user/pcmanfm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pcmanfm
pkgver=1.3.1
pkgrel=0
diff --git a/user/perl-app-licensecheck/APKBUILD b/user/perl-app-licensecheck/APKBUILD
index fb01bc146..feaf5f1c7 100644
--- a/user/perl-app-licensecheck/APKBUILD
+++ b/user/perl-app-licensecheck/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-app-licensecheck
_pkgreal=App-Licensecheck
diff --git a/user/perl-b-hooks-op-check/APKBUILD b/user/perl-b-hooks-op-check/APKBUILD
index 9bababe6c..b5dae3817 100644
--- a/user/perl-b-hooks-op-check/APKBUILD
+++ b/user/perl-b-hooks-op-check/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-b-hooks-op-check
_pkgreal=B-Hooks-OP-Check
diff --git a/user/perl-bareword-filehandles/APKBUILD b/user/perl-bareword-filehandles/APKBUILD
index cf17b46b1..02f04dbd9 100644
--- a/user/perl-bareword-filehandles/APKBUILD
+++ b/user/perl-bareword-filehandles/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-bareword-filehandles
_pkgreal=bareword-filehandles
diff --git a/user/perl-cpan-changes/APKBUILD b/user/perl-cpan-changes/APKBUILD
index 2f959c106..a83c9c4d1 100644
--- a/user/perl-cpan-changes/APKBUILD
+++ b/user/perl-cpan-changes/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-cpan-changes
_pkgreal=CPAN-Changes
diff --git a/user/perl-data-dump/APKBUILD b/user/perl-data-dump/APKBUILD
index c9fea4641..1ee807e32 100644
--- a/user/perl-data-dump/APKBUILD
+++ b/user/perl-data-dump/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-dump
_pkgreal=Data-Dump
diff --git a/user/perl-data-section/APKBUILD b/user/perl-data-section/APKBUILD
index 2160b02bc..cf5a6c7fe 100644
--- a/user/perl-data-section/APKBUILD
+++ b/user/perl-data-section/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-data-section
_pkgreal=Data-Section
diff --git a/user/perl-devel-hide/APKBUILD b/user/perl-devel-hide/APKBUILD
index 7be49e5e2..6b8f8c0c9 100644
--- a/user/perl-devel-hide/APKBUILD
+++ b/user/perl-devel-hide/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-devel-hide
_pkgreal=Devel-Hide
diff --git a/user/perl-importer/APKBUILD b/user/perl-importer/APKBUILD
index 08a28e060..f0e4c54c6 100644
--- a/user/perl-importer/APKBUILD
+++ b/user/perl-importer/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-importer
_pkgreal=Importer
diff --git a/user/perl-indirect/APKBUILD b/user/perl-indirect/APKBUILD
index 39027a11d..d9fe7b5fa 100644
--- a/user/perl-indirect/APKBUILD
+++ b/user/perl-indirect/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-indirect
_pkgreal=indirect
diff --git a/user/perl-multidimensional/APKBUILD b/user/perl-multidimensional/APKBUILD
index 97aa29a51..e9a1c6a17 100644
--- a/user/perl-multidimensional/APKBUILD
+++ b/user/perl-multidimensional/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-multidimensional
_pkgreal=multidimensional
diff --git a/user/perl-net-dbus/APKBUILD b/user/perl-net-dbus/APKBUILD
index 7e37848b4..175db7e79 100644
--- a/user/perl-net-dbus/APKBUILD
+++ b/user/perl-net-dbus/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-dbus
_pkgreal=Net-DBus
diff --git a/user/perl-net-snmp/APKBUILD b/user/perl-net-snmp/APKBUILD
index 6bf970c7a..59d422374 100644
--- a/user/perl-net-snmp/APKBUILD
+++ b/user/perl-net-snmp/APKBUILD
@@ -1,5 +1,5 @@
# Automatically generated by apkbuild-cpan, template 1
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-net-snmp
_pkgreal=Net-SNMP
diff --git a/user/perl-number-range/APKBUILD b/user/perl-number-range/APKBUILD
index c81342876..ef468957e 100644
--- a/user/perl-number-range/APKBUILD
+++ b/user/perl-number-range/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-number-range
_pkgreal=Number-Range
diff --git a/user/perl-parallel-forkmanager/APKBUILD b/user/perl-parallel-forkmanager/APKBUILD
index 8e194b501..80445850b 100644
--- a/user/perl-parallel-forkmanager/APKBUILD
+++ b/user/perl-parallel-forkmanager/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adelie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-parallel-forkmanager
_pkgreal=Parallel-ForkManager
diff --git a/user/perl-path-iterator-rule/APKBUILD b/user/perl-path-iterator-rule/APKBUILD
index edc9d6b0a..4e159528b 100644
--- a/user/perl-path-iterator-rule/APKBUILD
+++ b/user/perl-path-iterator-rule/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-path-iterator-rule
_pkgreal=Path-Iterator-Rule
diff --git a/user/perl-pod-constants/APKBUILD b/user/perl-pod-constants/APKBUILD
index 4715fffbe..d513b270a 100644
--- a/user/perl-pod-constants/APKBUILD
+++ b/user/perl-pod-constants/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-pod-constants
_pkgreal=Pod-Constants
diff --git a/user/perl-probe-perl/APKBUILD b/user/perl-probe-perl/APKBUILD
index 51ea21c2a..3d4be6cf7 100644
--- a/user/perl-probe-perl/APKBUILD
+++ b/user/perl-probe-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-probe-perl
_pkgreal=Probe-Perl
diff --git a/user/perl-regexp-common/APKBUILD b/user/perl-regexp-common/APKBUILD
index 4adb207f6..424bcf031 100644
--- a/user/perl-regexp-common/APKBUILD
+++ b/user/perl-regexp-common/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-common
_pkgreal=Regexp-Common
diff --git a/user/perl-regexp-pattern-license/APKBUILD b/user/perl-regexp-pattern-license/APKBUILD
index 1b47b7406..1e9b2c317 100644
--- a/user/perl-regexp-pattern-license/APKBUILD
+++ b/user/perl-regexp-pattern-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern-license
_pkgreal=Regexp-Pattern-License
diff --git a/user/perl-regexp-pattern/APKBUILD b/user/perl-regexp-pattern/APKBUILD
index 55c780f00..91ee844aa 100644
--- a/user/perl-regexp-pattern/APKBUILD
+++ b/user/perl-regexp-pattern/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-regexp-pattern
_pkgreal=Regexp-Pattern
diff --git a/user/perl-software-license/APKBUILD b/user/perl-software-license/APKBUILD
index a462cd961..fa1d5ede7 100644
--- a/user/perl-software-license/APKBUILD
+++ b/user/perl-software-license/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-software-license
_pkgreal=Software-License
diff --git a/user/perl-sort-key/APKBUILD b/user/perl-sort-key/APKBUILD
index bd2860b5e..c79e65b6c 100644
--- a/user/perl-sort-key/APKBUILD
+++ b/user/perl-sort-key/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sort-key
_pkgreal=Sort-Key
diff --git a/user/perl-strictures/APKBUILD b/user/perl-strictures/APKBUILD
index ee70baec6..dcd606c28 100644
--- a/user/perl-strictures/APKBUILD
+++ b/user/perl-strictures/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-strictures
_pkgreal=strictures
diff --git a/user/perl-string-copyright/APKBUILD b/user/perl-string-copyright/APKBUILD
index 1f9e7ba12..8845406bf 100644
--- a/user/perl-string-copyright/APKBUILD
+++ b/user/perl-string-copyright/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-copyright
_pkgreal=String-Copyright
diff --git a/user/perl-string-escape/APKBUILD b/user/perl-string-escape/APKBUILD
index dcaddac1a..3554a6515 100644
--- a/user/perl-string-escape/APKBUILD
+++ b/user/perl-string-escape/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-string-escape
_pkgreal=String-Escape
diff --git a/user/perl-sub-info/APKBUILD b/user/perl-sub-info/APKBUILD
index ba2ccfe70..7b15654d3 100644
--- a/user/perl-sub-info/APKBUILD
+++ b/user/perl-sub-info/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-sub-info
_pkgreal=Sub-Info
diff --git a/user/perl-term-size-any/APKBUILD b/user/perl-term-size-any/APKBUILD
index 6cbe47d52..b375a39fd 100644
--- a/user/perl-term-size-any/APKBUILD
+++ b/user/perl-term-size-any/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-any
_pkgreal=Term-Size-Any
diff --git a/user/perl-term-size-perl/APKBUILD b/user/perl-term-size-perl/APKBUILD
index 64f392b32..95f41c847 100644
--- a/user/perl-term-size-perl/APKBUILD
+++ b/user/perl-term-size-perl/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-size-perl
_pkgreal=Term-Size-Perl
diff --git a/user/perl-term-table/APKBUILD b/user/perl-term-table/APKBUILD
index 7dedbbcea..1061b87dc 100644
--- a/user/perl-term-table/APKBUILD
+++ b/user/perl-term-table/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-term-table
_pkgreal=Term-Table
diff --git a/user/perl-test-command/APKBUILD b/user/perl-test-command/APKBUILD
index 4c364a153..80e863ad7 100644
--- a/user/perl-test-command/APKBUILD
+++ b/user/perl-test-command/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-command
_pkgreal=Test-Command
diff --git a/user/perl-test-failwarnings/APKBUILD b/user/perl-test-failwarnings/APKBUILD
index 6573c3a00..588d46813 100644
--- a/user/perl-test-failwarnings/APKBUILD
+++ b/user/perl-test-failwarnings/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-failwarnings
_pkgreal=Test-FailWarnings
diff --git a/user/perl-test-filename/APKBUILD b/user/perl-test-filename/APKBUILD
index 5307ae2ff..623f16da4 100644
--- a/user/perl-test-filename/APKBUILD
+++ b/user/perl-test-filename/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-filename
_pkgreal=Test-Filename
diff --git a/user/perl-test-more-utf8/APKBUILD b/user/perl-test-more-utf8/APKBUILD
index aaaddc298..7b55bd96b 100644
--- a/user/perl-test-more-utf8/APKBUILD
+++ b/user/perl-test-more-utf8/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-more-utf8
_pkgreal=Test-More-UTF8
diff --git a/user/perl-test-script/APKBUILD b/user/perl-test-script/APKBUILD
index 8c01b8f73..2f7c359ef 100644
--- a/user/perl-test-script/APKBUILD
+++ b/user/perl-test-script/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test-script
_pkgreal=Test-Script
diff --git a/user/perl-test2-suite/APKBUILD b/user/perl-test2-suite/APKBUILD
index 1d5a2db4f..1b72d4a21 100644
--- a/user/perl-test2-suite/APKBUILD
+++ b/user/perl-test2-suite/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-test2-suite
_pkgreal=Test2-Suite
diff --git a/user/perl-text-template/APKBUILD b/user/perl-text-template/APKBUILD
index 076f1eee5..51e8225f4 100644
--- a/user/perl-text-template/APKBUILD
+++ b/user/perl-text-template/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-text-template
_pkgreal=Text-Template
diff --git a/user/perl-xml-namespacesupport/APKBUILD b/user/perl-xml-namespacesupport/APKBUILD
index b55e4123a..4de6e775e 100644
--- a/user/perl-xml-namespacesupport/APKBUILD
+++ b/user/perl-xml-namespacesupport/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-namespacesupport
_pkgreal=XML-NamespaceSupport
diff --git a/user/perl-xml-simple/APKBUILD b/user/perl-xml-simple/APKBUILD
index 14c99dbf7..62d543912 100644
--- a/user/perl-xml-simple/APKBUILD
+++ b/user/perl-xml-simple/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
pkgname=perl-xml-simple
_pkgreal=XML-Simple
diff --git a/user/pluma/APKBUILD b/user/pluma/APKBUILD
index fde49287d..4e0219e7d 100644
--- a/user/pluma/APKBUILD
+++ b/user/pluma/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=pluma
pkgver=1.22.2
pkgrel=0
diff --git a/user/prosody/APKBUILD b/user/prosody/APKBUILD
index 95b728b76..2281b6635 100644
--- a/user/prosody/APKBUILD
+++ b/user/prosody/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Mika Havela <mika.havela@gmail.com>
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=prosody
pkgver=0.11.3
pkgrel=0
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index cd4e52fbc..9efc662a9 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -1,4 +1,4 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=protobuf
diff --git a/user/py3-distutils-extra/APKBUILD b/user/py3-distutils-extra/APKBUILD
index 557658b55..8c177437b 100644
--- a/user/py3-distutils-extra/APKBUILD
+++ b/user/py3-distutils-extra/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-distutils-extra
pkgver=2.42
pkgrel=0
diff --git a/user/py3-pexpect/APKBUILD b/user/py3-pexpect/APKBUILD
index b4e0e1745..6d69fe292 100644
--- a/user/py3-pexpect/APKBUILD
+++ b/user/py3-pexpect/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pexpect
_pkgname=${pkgname#*-}
_p="${_pkgname#?}"
diff --git a/user/py3-ptyprocess/APKBUILD b/user/py3-ptyprocess/APKBUILD
index 981976f23..461336ba1 100644
--- a/user/py3-ptyprocess/APKBUILD
+++ b/user/py3-ptyprocess/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-ptyprocess
pkgver=0.6.0
pkgrel=0
diff --git a/user/py3-pycairo/APKBUILD b/user/py3-pycairo/APKBUILD
index 0e14ddb2d..3939f9af3 100644
--- a/user/py3-pycairo/APKBUILD
+++ b/user/py3-pycairo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pycairo
pkgver=1.18.2
pkgrel=0
diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD
index 3a84f8e09..8a1e8f527 100644
--- a/user/py3-pygobject/APKBUILD
+++ b/user/py3-pygobject/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=py3-pygobject
pkgver=3.34.0
pkgrel=0
diff --git a/user/qps/APKBUILD b/user/qps/APKBUILD
index 550bb8352..f1764e9b5 100644
--- a/user/qps/APKBUILD
+++ b/user/qps/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qps
pkgver=1.10.20
pkgrel=0
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 8b86da42c..648792265 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qt5ct
pkgver=0.41
pkgrel=0
diff --git a/user/qterminal/APKBUILD b/user/qterminal/APKBUILD
index 906759828..f4881ad35 100644
--- a/user/qterminal/APKBUILD
+++ b/user/qterminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qterminal
pkgver=0.14.1
pkgrel=0
diff --git a/user/qtermwidget/APKBUILD b/user/qtermwidget/APKBUILD
index 8894829c8..4a3d7cbc9 100644
--- a/user/qtermwidget/APKBUILD
+++ b/user/qtermwidget/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qtermwidget
pkgver=0.14.1
pkgrel=0
diff --git a/user/qtkeychain/APKBUILD b/user/qtkeychain/APKBUILD
index e3e861748..e54f1682d 100644
--- a/user/qtkeychain/APKBUILD
+++ b/user/qtkeychain/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=qtkeychain
pkgver=0.9.1
pkgrel=0
diff --git a/user/ristretto/APKBUILD b/user/ristretto/APKBUILD
index 6dd2d5251..880753eec 100644
--- a/user/ristretto/APKBUILD
+++ b/user/ristretto/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ristretto
pkgver=0.10.0
pkgrel=0
diff --git a/user/rubberband/APKBUILD b/user/rubberband/APKBUILD
index 4bbe58f6c..2e7275ae7 100644
--- a/user/rubberband/APKBUILD
+++ b/user/rubberband/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=rubberband
pkgver=1.8.2
pkgrel=0
diff --git a/user/screengrab/APKBUILD b/user/screengrab/APKBUILD
index 81b6e647e..167335214 100644
--- a/user/screengrab/APKBUILD
+++ b/user/screengrab/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=screengrab
pkgver=1.101
pkgrel=0
diff --git a/user/socat/APKBUILD b/user/socat/APKBUILD
index e5257103e..52bbd9f3a 100644
--- a/user/socat/APKBUILD
+++ b/user/socat/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=socat
pkgver=1.7.3.3
pkgrel=0
diff --git a/user/spectrwm/APKBUILD b/user/spectrwm/APKBUILD
index 7699adf7d..15ee54895 100644
--- a/user/spectrwm/APKBUILD
+++ b/user/spectrwm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=spectrwm
pkgver=3.2.0
_pkgver=$(printf '%s' "$pkgver" | tr . _)
diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD
index 65f205fb7..b1a09da15 100644
--- a/user/tf/APKBUILD
+++ b/user/tf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=tf
pkgver=5.0b8
_pkgver=${pkgver%.*}${pkgver#*.}
diff --git a/user/thunar-volman/APKBUILD b/user/thunar-volman/APKBUILD
index 6a2984dc6..036c50b31 100644
--- a/user/thunar-volman/APKBUILD
+++ b/user/thunar-volman/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=thunar-volman
pkgver=0.9.5
pkgrel=0
diff --git a/user/thunar/APKBUILD b/user/thunar/APKBUILD
index f18601085..014ab3ae8 100644
--- a/user/thunar/APKBUILD
+++ b/user/thunar/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=thunar
pkgver=1.8.11
pkgrel=0
diff --git a/user/trojita/APKBUILD b/user/trojita/APKBUILD
index 429226f42..8f2088e88 100644
--- a/user/trojita/APKBUILD
+++ b/user/trojita/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=trojita
pkgver=0.7
pkgrel=0
diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD
index 3524e7a01..c92b41be5 100644
--- a/user/ttf-sudo/APKBUILD
+++ b/user/ttf-sudo/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ttf-sudo
pkgver=0.40
pkgrel=0
diff --git a/user/ttf-terminus/APKBUILD b/user/ttf-terminus/APKBUILD
index ebb4f09f4..69167790b 100644
--- a/user/ttf-terminus/APKBUILD
+++ b/user/ttf-terminus/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=ttf-terminus
pkgver=4.47.0
pkgrel=0
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 98adfba5d..82886aa02 100644
--- a/user/tumbler/APKBUILD
+++ b/user/tumbler/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=tumbler
pkgver=0.2.7
pkgrel=1
diff --git a/user/uchardet/APKBUILD b/user/uchardet/APKBUILD
index 08770a326..05f10ff7b 100644
--- a/user/uchardet/APKBUILD
+++ b/user/uchardet/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uchardet
pkgver=0.0.6
pkgrel=0
diff --git a/user/unicode-data/APKBUILD b/user/unicode-data/APKBUILD
index 310ed9347..8687ff2ca 100644
--- a/user/unicode-data/APKBUILD
+++ b/user/unicode-data/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=unicode-data
pkgver=12.1.0
pkgrel=0
diff --git a/user/uptimed/APKBUILD b/user/uptimed/APKBUILD
index e92be5366..3ae155396 100644
--- a/user/uptimed/APKBUILD
+++ b/user/uptimed/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Bartłomiej Piotrowski <bpiotrowski@alpinelinux.org>
# Contributor: A. Wilcox <awilfox@adelielinux.org>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=uptimed
pkgver=0.4.2
pkgrel=0
diff --git a/user/vala/APKBUILD b/user/vala/APKBUILD
index 5cc2cae14..64a5e2016 100644
--- a/user/vala/APKBUILD
+++ b/user/vala/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vala
pkgver=0.46.4
pkgrel=0
diff --git a/user/vamp-sdk/APKBUILD b/user/vamp-sdk/APKBUILD
index b97a8c2df..26c4f887b 100644
--- a/user/vamp-sdk/APKBUILD
+++ b/user/vamp-sdk/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vamp-sdk
pkgver=2.7.1
pkgrel=0
diff --git a/user/vte/APKBUILD b/user/vte/APKBUILD
index 59dce1937..58de10863 100644
--- a/user/vte/APKBUILD
+++ b/user/vte/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=vte
pkgver=0.58.2
pkgrel=0
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index d18e9cf69..a19b53ddc 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -1,6 +1,6 @@
# Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
# Contributor: zlg <zlg+adelie@zlg.space>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=weechat
pkgver=2.6
pkgrel=0
diff --git a/user/which/APKBUILD b/user/which/APKBUILD
index cea55c32a..ab0d0a5bc 100644
--- a/user/which/APKBUILD
+++ b/user/which/APKBUILD
@@ -1,5 +1,5 @@
# Contributor: Stuart Cardall <developer@it-offshore.co.uk>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=which
pkgver=2.21
pkgrel=2
diff --git a/user/xdg-user-dirs/APKBUILD b/user/xdg-user-dirs/APKBUILD
index e754a868e..1f717c632 100644
--- a/user/xdg-user-dirs/APKBUILD
+++ b/user/xdg-user-dirs/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xdg-user-dirs
pkgver=0.17
pkgrel=0
diff --git a/user/xfburn/APKBUILD b/user/xfburn/APKBUILD
index 20923ed26..0dd528edd 100644
--- a/user/xfburn/APKBUILD
+++ b/user/xfburn/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfburn
pkgver=0.6.1
pkgrel=0
diff --git a/user/xfce-desktop/APKBUILD b/user/xfce-desktop/APKBUILD
index 7044a7dd7..122ea66b2 100644
--- a/user/xfce-desktop/APKBUILD
+++ b/user/xfce-desktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce-desktop
pkgver=4.13
pkgrel=0
diff --git a/user/xfce-plugins/APKBUILD b/user/xfce-plugins/APKBUILD
index 8b9396447..df0c53aca 100644
--- a/user/xfce-plugins/APKBUILD
+++ b/user/xfce-plugins/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce-plugins
pkgver=0.1
pkgrel=0
diff --git a/user/xfce4-appfinder/APKBUILD b/user/xfce4-appfinder/APKBUILD
index 4a516b885..5e5fc3f30 100644
--- a/user/xfce4-appfinder/APKBUILD
+++ b/user/xfce4-appfinder/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-appfinder
pkgver=4.14.0
pkgrel=0
diff --git a/user/xfce4-battery-plugin/APKBUILD b/user/xfce4-battery-plugin/APKBUILD
index 867c05676..87d4be1ab 100644
--- a/user/xfce4-battery-plugin/APKBUILD
+++ b/user/xfce4-battery-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-battery-plugin
pkgver=1.1.3
pkgrel=0
diff --git a/user/xfce4-clipman-plugin/APKBUILD b/user/xfce4-clipman-plugin/APKBUILD
index 2ca1be37e..dfa5c7cef 100644
--- a/user/xfce4-clipman-plugin/APKBUILD
+++ b/user/xfce4-clipman-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-clipman-plugin
pkgver=1.4.3
pkgrel=1
diff --git a/user/xfce4-cpugraph-plugin/APKBUILD b/user/xfce4-cpugraph-plugin/APKBUILD
index 6295a2aa5..c3646f5d3 100644
--- a/user/xfce4-cpugraph-plugin/APKBUILD
+++ b/user/xfce4-cpugraph-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-cpugraph-plugin
pkgver=1.1.0
pkgrel=0
diff --git a/user/xfce4-dict/APKBUILD b/user/xfce4-dict/APKBUILD
index 1aad37ff0..1185b416b 100644
--- a/user/xfce4-dict/APKBUILD
+++ b/user/xfce4-dict/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-dict
pkgver=0.8.3
pkgrel=0
diff --git a/user/xfce4-diskperf-plugin/APKBUILD b/user/xfce4-diskperf-plugin/APKBUILD
index ef82ecf56..0d6c2021b 100644
--- a/user/xfce4-diskperf-plugin/APKBUILD
+++ b/user/xfce4-diskperf-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-diskperf-plugin
pkgver=2.6.2
pkgrel=0
diff --git a/user/xfce4-indicator-plugin/APKBUILD b/user/xfce4-indicator-plugin/APKBUILD
index c0d02810f..4056cf575 100644
--- a/user/xfce4-indicator-plugin/APKBUILD
+++ b/user/xfce4-indicator-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-indicator-plugin
pkgver=2.3.4
pkgrel=1
diff --git a/user/xfce4-netload-plugin/APKBUILD b/user/xfce4-netload-plugin/APKBUILD
index 743aa161e..a72fedae8 100644
--- a/user/xfce4-netload-plugin/APKBUILD
+++ b/user/xfce4-netload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-netload-plugin
pkgver=1.3.2
pkgrel=0
diff --git a/user/xfce4-notifyd/APKBUILD b/user/xfce4-notifyd/APKBUILD
index 5bc42afc4..c6d9edbd8 100644
--- a/user/xfce4-notifyd/APKBUILD
+++ b/user/xfce4-notifyd/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-notifyd
pkgver=0.4.4
pkgrel=1
diff --git a/user/xfce4-panel-profiles/APKBUILD b/user/xfce4-panel-profiles/APKBUILD
index 503943b62..1d466b686 100644
--- a/user/xfce4-panel-profiles/APKBUILD
+++ b/user/xfce4-panel-profiles/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-panel-profiles
pkgver=1.0.9
pkgrel=0
diff --git a/user/xfce4-panel/APKBUILD b/user/xfce4-panel/APKBUILD
index 8632458d9..859e8b065 100644
--- a/user/xfce4-panel/APKBUILD
+++ b/user/xfce4-panel/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-panel
pkgver=4.14.1
pkgrel=0
diff --git a/user/xfce4-power-manager/APKBUILD b/user/xfce4-power-manager/APKBUILD
index 0d7f38a38..0af1ac10f 100644
--- a/user/xfce4-power-manager/APKBUILD
+++ b/user/xfce4-power-manager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-power-manager
pkgver=1.6.5
pkgrel=0
diff --git a/user/xfce4-pulseaudio-plugin/APKBUILD b/user/xfce4-pulseaudio-plugin/APKBUILD
index 77c6f3515..71a3dcb4f 100644
--- a/user/xfce4-pulseaudio-plugin/APKBUILD
+++ b/user/xfce4-pulseaudio-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-pulseaudio-plugin
pkgver=0.4.2
pkgrel=0
diff --git a/user/xfce4-screenshooter/APKBUILD b/user/xfce4-screenshooter/APKBUILD
index 9b610d066..146d3d85c 100644
--- a/user/xfce4-screenshooter/APKBUILD
+++ b/user/xfce4-screenshooter/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-screenshooter
pkgver=1.9.7
pkgrel=0
diff --git a/user/xfce4-sensors-plugin/APKBUILD b/user/xfce4-sensors-plugin/APKBUILD
index 781ec965d..15b39e6ea 100644
--- a/user/xfce4-sensors-plugin/APKBUILD
+++ b/user/xfce4-sensors-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-sensors-plugin
pkgver=1.3.92
pkgrel=0
diff --git a/user/xfce4-session/APKBUILD b/user/xfce4-session/APKBUILD
index 8ccbb3378..5f4043b68 100644
--- a/user/xfce4-session/APKBUILD
+++ b/user/xfce4-session/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-session
pkgver=4.14.0
pkgrel=0
diff --git a/user/xfce4-settings/APKBUILD b/user/xfce4-settings/APKBUILD
index 1246a51a8..f6cef7748 100644
--- a/user/xfce4-settings/APKBUILD
+++ b/user/xfce4-settings/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-settings
pkgver=4.14.1
pkgrel=0
diff --git a/user/xfce4-systemload-plugin/APKBUILD b/user/xfce4-systemload-plugin/APKBUILD
index 32950f105..5f20a001c 100644
--- a/user/xfce4-systemload-plugin/APKBUILD
+++ b/user/xfce4-systemload-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-systemload-plugin
pkgver=1.2.3
pkgrel=0
diff --git a/user/xfce4-taskmanager/APKBUILD b/user/xfce4-taskmanager/APKBUILD
index daac4f234..16cf945b1 100644
--- a/user/xfce4-taskmanager/APKBUILD
+++ b/user/xfce4-taskmanager/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-taskmanager
pkgver=1.2.2
pkgrel=0
diff --git a/user/xfce4-terminal/APKBUILD b/user/xfce4-terminal/APKBUILD
index 5e09bf24c..fb16a6693 100644
--- a/user/xfce4-terminal/APKBUILD
+++ b/user/xfce4-terminal/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-terminal
pkgver=0.8.8
pkgrel=0
diff --git a/user/xfce4-time-out-plugin/APKBUILD b/user/xfce4-time-out-plugin/APKBUILD
index da47061b6..0b34b3d77 100644
--- a/user/xfce4-time-out-plugin/APKBUILD
+++ b/user/xfce4-time-out-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-time-out-plugin
pkgver=1.1.0
pkgrel=0
diff --git a/user/xfce4-timer-plugin/APKBUILD b/user/xfce4-timer-plugin/APKBUILD
index b59b00931..e17181b87 100644
--- a/user/xfce4-timer-plugin/APKBUILD
+++ b/user/xfce4-timer-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-timer-plugin
pkgver=1.7.0
pkgrel=1
diff --git a/user/xfce4-verve-plugin/APKBUILD b/user/xfce4-verve-plugin/APKBUILD
index 935a39a5f..b90957cd6 100644
--- a/user/xfce4-verve-plugin/APKBUILD
+++ b/user/xfce4-verve-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-verve-plugin
pkgver=2.0.0
pkgrel=1
diff --git a/user/xfce4-volumed-pulse/APKBUILD b/user/xfce4-volumed-pulse/APKBUILD
index bfaa8f297..070e189e0 100644
--- a/user/xfce4-volumed-pulse/APKBUILD
+++ b/user/xfce4-volumed-pulse/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-volumed-pulse
pkgver=0.2.3
pkgrel=0
diff --git a/user/xfce4-whiskermenu-plugin/APKBUILD b/user/xfce4-whiskermenu-plugin/APKBUILD
index cf44747f1..f9d1dfeef 100644
--- a/user/xfce4-whiskermenu-plugin/APKBUILD
+++ b/user/xfce4-whiskermenu-plugin/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfce4-whiskermenu-plugin
pkgver=2.3.4
_pkgmaj=${pkgver%.*}
diff --git a/user/xfconf/APKBUILD b/user/xfconf/APKBUILD
index d13a4dceb..e66232ca3 100644
--- a/user/xfconf/APKBUILD
+++ b/user/xfconf/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfconf
pkgver=4.14.1
pkgrel=0
diff --git a/user/xfdashboard/APKBUILD b/user/xfdashboard/APKBUILD
index af4013ff8..bbf373200 100644
--- a/user/xfdashboard/APKBUILD
+++ b/user/xfdashboard/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfdashboard
pkgver=0.7.5
pkgrel=1
diff --git a/user/xfdesktop/APKBUILD b/user/xfdesktop/APKBUILD
index 7b5083068..03c23058a 100644
--- a/user/xfdesktop/APKBUILD
+++ b/user/xfdesktop/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfdesktop
pkgver=4.14.1
pkgrel=0
diff --git a/user/xfmpc/APKBUILD b/user/xfmpc/APKBUILD
index dc889ea14..96e346059 100644
--- a/user/xfmpc/APKBUILD
+++ b/user/xfmpc/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfmpc
pkgver=0.3.0
pkgrel=1
diff --git a/user/xfwm4/APKBUILD b/user/xfwm4/APKBUILD
index 4dbd07d10..b74170b6d 100644
--- a/user/xfwm4/APKBUILD
+++ b/user/xfwm4/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xfwm4
pkgver=4.14.0
pkgrel=0
diff --git a/user/xorg-gtest/APKBUILD b/user/xorg-gtest/APKBUILD
index 572976147..2f18a49bc 100644
--- a/user/xorg-gtest/APKBUILD
+++ b/user/xorg-gtest/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xorg-gtest
pkgver=0.7.1
pkgrel=0
diff --git a/user/xscreensaver/APKBUILD b/user/xscreensaver/APKBUILD
index 9e68c3eda..4e8a19fc4 100644
--- a/user/xscreensaver/APKBUILD
+++ b/user/xscreensaver/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xscreensaver
pkgver=5.43
pkgrel=0
diff --git a/user/xterm/APKBUILD b/user/xterm/APKBUILD
index 1e4c02575..96d8d08f7 100644
--- a/user/xterm/APKBUILD
+++ b/user/xterm/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=xterm
pkgver=350
pkgrel=0
diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD
index 926ecf235..50e88d1c6 100644
--- a/user/yubico-c/APKBUILD
+++ b/user/yubico-c/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=yubico-c
pkgver=1.13
pkgrel=2
diff --git a/user/yubikey-personalization/APKBUILD b/user/yubikey-personalization/APKBUILD
index 7fff47158..74b2a3f2f 100644
--- a/user/yubikey-personalization/APKBUILD
+++ b/user/yubikey-personalization/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=yubikey-personalization
pkgver=1.20.0
pkgrel=0
diff --git a/user/zenity/APKBUILD b/user/zenity/APKBUILD
index 234508b94..ddade8630 100644
--- a/user/zenity/APKBUILD
+++ b/user/zenity/APKBUILD
@@ -1,5 +1,5 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
+# Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
pkgname=zenity
pkgver=3.32.0
pkgrel=0