summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-16 23:01:30 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2014-05-16 23:01:30 -0300
commit6ad57227f7b97199555231385e709eb18baaab68 (patch)
tree51c1cafc66d374f5db7ec0deefd472fa41f5f84f /libre
parent3b9de5318d622ea0e0024bc62e15faaaf5c11542 (diff)
downloadabslibre-6ad57227f7b97199555231385e709eb18baaab68.tar.gz
abslibre-6ad57227f7b97199555231385e709eb18baaab68.tar.bz2
abslibre-6ad57227f7b97199555231385e709eb18baaab68.zip
fix "Maintainer:"/"Contributor:" style, add "(Arch)" for Maintainers and Contributors from Arch and remove (Parabola) for us
Diffstat (limited to 'libre')
-rw-r--r--libre/abiword-libre/PKGBUILD6
-rw-r--r--libre/abs/PKGBUILD2
-rw-r--r--libre/abuse-libre/PKGBUILD10
-rw-r--r--libre/acpi_call-libre-lts/PKGBUILD8
-rw-r--r--libre/acpi_call-libre/PKGBUILD8
-rw-r--r--libre/angband-libre/PKGBUILD18
-rw-r--r--libre/antlr2/PKGBUILD4
-rw-r--r--libre/apache-ant/PKGBUILD2
-rw-r--r--libre/arora-libre/PKGBUILD8
-rw-r--r--libre/atool-libre/PKGBUILD12
-rw-r--r--libre/atril-libre/PKGBUILD4
-rw-r--r--libre/audacious-plugins-libre/PKGBUILD12
-rw-r--r--libre/audex-libre/PKGBUILD10
-rw-r--r--libre/audio-convert-libre/PKGBUILD6
-rw-r--r--libre/avidemux-libre/PKGBUILD4
-rw-r--r--libre/avidemux-libre/PKGBUILD.WIP4
-rw-r--r--libre/bbswitch-libre/PKGBUILD8
-rw-r--r--libre/bfgminer-libre/PKGBUILD4
-rw-r--r--libre/bitlbee-libre/PKGBUILD14
-rw-r--r--libre/blackbox-libre/PKGBUILD8
-rw-r--r--libre/bogofilter-libre/PKGBUILD6
-rw-r--r--libre/bumblebee-libre/PKGBUILD4
-rw-r--r--libre/cacert-dot-org/PKGBUILD4
-rw-r--r--libre/calibre-libre/PKGBUILD14
-rw-r--r--libre/cdrkit-libre/PKGBUILD4
-rw-r--r--libre/clementine-libre/PKGBUILD14
-rw-r--r--libre/crosstool-ng/PKGBUILD6
-rw-r--r--libre/cups-filters-libre/PKGBUILD2
-rw-r--r--libre/doublecmd-libre/PKGBUILD4
-rw-r--r--libre/dvdrip-libre/PKGBUILD6
-rw-r--r--libre/dvdrtools-libre/PKGBUILD8
-rw-r--r--libre/ecasound-libre/PKGBUILD8
-rw-r--r--libre/engrampa-libre/PKGBUILD4
-rw-r--r--libre/epdfview-libre/PKGBUILD14
-rw-r--r--libre/epiphany-libre/PKGBUILD6
-rw-r--r--libre/evince-libre/PKGBUILD4
-rw-r--r--libre/file-roller-libre/PKGBUILD4
-rw-r--r--libre/filesystem/PKGBUILD6
-rw-r--r--libre/gloobus-preview-libre/PKGBUILD2
-rw-r--r--libre/gnome-boxes-libre/PKGBUILD8
-rw-r--r--libre/gnome-menus/PKGBUILD2
-rw-r--r--libre/gnormalize-libre/PKGBUILD10
-rw-r--r--libre/grub-legacy/PKGBUILD8
-rw-r--r--libre/grub/PKGBUILD10
-rw-r--r--libre/gst-plugins-bad-libre/PKGBUILD4
-rw-r--r--libre/gstreamer0.10-bad-libre/PKGBUILD6
-rw-r--r--libre/gummiboot/PKGBUILD10
-rw-r--r--libre/hardinfo/PKGBUILD4
-rw-r--r--libre/hexchat-libre/PKGBUILD6
-rw-r--r--libre/hplip-libre/PKGBUILD8
-rw-r--r--libre/hydrogen-libre/PKGBUILD8
-rw-r--r--libre/icecat-adblock-plus/PKGBUILD2
-rw-r--r--libre/icecat-firebug/PKGBUILD2
-rw-r--r--libre/icecat-noscript/PKGBUILD4
-rw-r--r--libre/icecat-raismth/PKGBUILD2
-rw-r--r--libre/icecat-spell-ru/PKGBUILD4
-rw-r--r--libre/icecat/PKGBUILD10
-rw-r--r--libre/iceweasel-adblock-plus/PKGBUILD2
-rw-r--r--libre/iceweasel-firebug/PKGBUILD2
-rw-r--r--libre/iceweasel-libre/PKGBUILD10
-rw-r--r--libre/iceweasel-noscript/PKGBUILD4
-rw-r--r--libre/iceweasel-raismth/PKGBUILD2
-rw-r--r--libre/iceweasel-spell-ru/PKGBUILD4
-rw-r--r--libre/kdebase-konqueror-libre/PKGBUILD8
-rw-r--r--libre/kdebase-runtime-libre/PKGBUILD6
-rw-r--r--libre/kdelibs-libre/PKGBUILD6
-rw-r--r--libre/kdenetwork-kopete-libre/PKGBUILD4
-rw-r--r--libre/kdeutils-ark-libre/PKGBUILD4
-rw-r--r--libre/kile-libre/PKGBUILD8
-rw-r--r--libre/kipi-plugins-libre/PKGBUILD10
-rw-r--r--libre/lesspipe-libre/PKGBUILD6
-rw-r--r--libre/libosinfo-libre/PKGBUILD6
-rw-r--r--libre/libquicktime-libre/PKGBUILD6
-rw-r--r--libre/libretools/PKGBUILD2
-rw-r--r--libre/licenses-libre/PKGBUILD8
-rw-r--r--libre/liferea-libre/PKGBUILD6
-rw-r--r--libre/linux-libre-api-headers/PKGBUILD4
-rw-r--r--libre/linux-libre-grsec/PKGBUILD20
-rw-r--r--libre/linux-libre-lts/PKGBUILD14
-rw-r--r--libre/linux-libre-manpages/PKGBUILD6
-rw-r--r--libre/linux-libre-tools/PKGBUILD4
-rw-r--r--libre/linux-libre/PKGBUILD14
-rw-r--r--libre/lirc-libre/PKGBUILD4
-rw-r--r--libre/lsb-release/PKGBUILD10
-rw-r--r--libre/luxrender-libre/PKGBUILD8
-rw-r--r--libre/mc-libre/PKGBUILD8
-rw-r--r--libre/mcomix-libre/PKGBUILD6
-rw-r--r--libre/mesa-demos-libre/PKGBUILD6
-rw-r--r--libre/midori-libre-gtk3/PKGBUILD14
-rw-r--r--libre/midori-libre/PKGBUILD12
-rw-r--r--libre/mime-types/PKGBUILD6
-rw-r--r--libre/mkisolinux/PKGBUILD2
-rw-r--r--libre/mkpxelinux/PKGBUILD2
-rw-r--r--libre/mksyslinux/PKGBUILD2
-rw-r--r--libre/mozilla-searchplugins/PKGBUILD6
-rw-r--r--libre/mplayer-libre-vaapi/PKGBUILD12
-rw-r--r--libre/mplayer-libre/PKGBUILD10
-rw-r--r--libre/netsurf-libre/PKGBUILD10
-rw-r--r--libre/nss/PKGBUILD6
-rw-r--r--libre/ogmrip-libre/PKGBUILD10
-rw-r--r--libre/openexr-libre/PKGBUILD4
-rw-r--r--libre/openshot-libre/PKGBUILD6
-rw-r--r--libre/oss-libre/PKGBUILD10
-rw-r--r--libre/p7zip-libre/PKGBUILD10
-rw-r--r--libre/pacman-mirrorlist-libre/PKGBUILD6
-rw-r--r--libre/pacman/PKGBUILD4
-rw-r--r--libre/parabola-themes-slim/PKGBUILD4
-rw-r--r--libre/parabola-xdg-menu/PKGBUILD6
-rw-r--r--libre/parabolaiso/PKGBUILD6
-rw-r--r--libre/ponysay-libre/PKGBUILD8
-rw-r--r--libre/povray-libre/PKGBUILD12
-rw-r--r--libre/psi/PKGBUILD4
-rw-r--r--libre/psutils-libre/PKGBUILD10
-rw-r--r--libre/python-reportlab-libre/PKGBUILD10
-rw-r--r--libre/qupzilla-libre/PKGBUILD4
-rw-r--r--libre/reflector/PKGBUILD4
-rw-r--r--libre/rp-pppoe-libre/PKGBUILD6
-rw-r--r--libre/ruby-rdiscount/PKGBUILD2
-rw-r--r--libre/sdl-libre/PKGBUILD10
-rw-r--r--libre/soundkonverter-libre/PKGBUILD10
-rw-r--r--libre/spectrwm-libre/PKGBUILD4
-rw-r--r--libre/stuntrally-data-libre/PKGBUILD4
-rw-r--r--libre/syslinux/PKGBUILD8
-rw-r--r--libre/texlive-bin-libre/PKGBUILD8
-rw-r--r--libre/texlive-core-libre/PKGBUILD6
-rw-r--r--libre/texlive-fontsextra-libre/PKGBUILD6
-rw-r--r--libre/texlive-latexextra-libre/PKGBUILD8
-rw-r--r--libre/tokyocabinet/PKGBUILD4
-rw-r--r--libre/tp_smapi-libre-lts/PKGBUILD18
-rw-r--r--libre/tp_smapi-libre/PKGBUILD18
-rw-r--r--libre/unar/PKGBUILD6
-rw-r--r--libre/unzip-libre/PKGBUILD6
-rw-r--r--libre/usermin/PKGBUILD2
-rw-r--r--libre/vhba-module-libre/PKGBUILD8
-rw-r--r--libre/vim-colorsamplerpack-libre/PKGBUILD6
-rw-r--r--libre/vim-runtime/PKGBUILD12
-rw-r--r--libre/webmin/PKGBUILD2
-rw-r--r--libre/wings3d-libre/PKGBUILD6
-rw-r--r--libre/xarchiver-libre/PKGBUILD8
-rw-r--r--libre/xbmc-libre-lts/PKGBUILD12
-rw-r--r--libre/xbmc-libre/PKGBUILD12
-rw-r--r--libre/xbmc-pvr-addons-lts/PKGBUILD4
-rw-r--r--libre/xchat-libre/PKGBUILD4
-rw-r--r--libre/xmlstarlet/PKGBUILD6
-rw-r--r--libre/xorg-fonts-100dpi-libre/PKGBUILD6
-rw-r--r--libre/xorg-fonts-75dpi-libre/PKGBUILD4
-rw-r--r--libre/xorg-fonts-type1-libre/PKGBUILD2
-rw-r--r--libre/xscreensaver-libre/PKGBUILD4
-rw-r--r--libre/xsp/PKGBUILD4
149 files changed, 507 insertions, 507 deletions
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 0139961e0..b49c27a84 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 209913 2014-04-08 14:24:40Z andyrtr $
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Maël Lavault <moimael@neuf.fr>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
+# Contributor (Arch): Maël Lavault <moimael@neuf.fr>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgbase=abiword
pkgbase=abiword-libre
diff --git a/libre/abs/PKGBUILD b/libre/abs/PKGBUILD
index 657677114..cde9187b5 100644
--- a/libre/abs/PKGBUILD
+++ b/libre/abs/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $
-# Maintainer: Allan McRae <allan@archlinux.org>
+# Maintainer (Arch): Allan McRae <allan@archlinux.org>
pkgname=abs
pkgver=2.4.4
diff --git a/libre/abuse-libre/PKGBUILD b/libre/abuse-libre/PKGBUILD
index 416644e81..dfffa4947 100644
--- a/libre/abuse-libre/PKGBUILD
+++ b/libre/abuse-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 101370 2013-11-23 19:00:48Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: jlvsimoes <jlvsimoes@oninet.pt>
-# Contributor: kevin <kevin@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): jlvsimoes <jlvsimoes@oninet.pt>
+# Contributor (Arch): kevin <kevin@archlinux.org>
+# Contributor: André Silva <emulatorman@parabola.nu>
_pkgname=abuse
pkgname=abuse-libre
diff --git a/libre/acpi_call-libre-lts/PKGBUILD b/libre/acpi_call-libre-lts/PKGBUILD
index 5b24a2801..5dfcc3ed3 100644
--- a/libre/acpi_call-libre-lts/PKGBUILD
+++ b/libre/acpi_call-libre-lts/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 106771 2014-03-07 14:36:15Z bpiotrowski $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: mortzu <me@mortzu.de>
-# Contributor: fnord0 <fnord0@riseup.net>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
+# Contributor (Arch): mortzu <me@mortzu.de>
+# Contributor (Arch): fnord0 <fnord0@riseup.net>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=acpi_call-lts
pkgname=acpi_call-libre-lts
diff --git a/libre/acpi_call-libre/PKGBUILD b/libre/acpi_call-libre/PKGBUILD
index 24b89ccdc..2fd6569a6 100644
--- a/libre/acpi_call-libre/PKGBUILD
+++ b/libre/acpi_call-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 108706 2014-04-01 22:24:11Z thomas $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: mortzu <me@mortzu.de>
-# Contributor: fnord0 <fnord0@riseup.net>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
+# Contributor (Arch): mortzu <me@mortzu.de>
+# Contributor (Arch): fnord0 <fnord0@riseup.net>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=acpi_call
pkgname=acpi_call-libre
diff --git a/libre/angband-libre/PKGBUILD b/libre/angband-libre/PKGBUILD
index c0b222055..e8a827150 100644
--- a/libre/angband-libre/PKGBUILD
+++ b/libre/angband-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Mike Sampson <mike at sambodata dot com>
-# Contributor: Adrian Stratulat <adrian.stratulat at inboxcom>
-# Contributor: Anton Bazhenov <anton.bazhenov at gmail>
-# Contributor: KillaB <xGenoBlast@gmail.com>
-# Contributor: Callan Barrett <wizzomafizzo@gmail.com>
-# Contributor: Christian Schmidt <xmucknertx@googlemail.com>
-# Contributor: Sebastian Sareyko <public@nooms.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): schuay <jakob.gruber@gmail.com>
+# Contributor (Arch): Mike Sampson <mike at sambodata dot com>
+# Contributor (Arch): Adrian Stratulat <adrian.stratulat at inboxcom>
+# Contributor (Arch): Anton Bazhenov <anton.bazhenov at gmail>
+# Contributor (Arch): KillaB <xGenoBlast@gmail.com>
+# Contributor (Arch): Callan Barrett <wizzomafizzo@gmail.com>
+# Contributor (Arch): Christian Schmidt <xmucknertx@googlemail.com>
+# Contributor (Arch): Sebastian Sareyko <public@nooms.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=angband
pkgname=angband-libre
diff --git a/libre/antlr2/PKGBUILD b/libre/antlr2/PKGBUILD
index 4b69536c8..5d0fd6eb0 100644
--- a/libre/antlr2/PKGBUILD
+++ b/libre/antlr2/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor: George Giorgidze <giorgidze (at) gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor (Arch): George Giorgidze <giorgidze (at) gmail.com>
+# Contributor (Arch): Stefan Husmann <stefan-husmann@t-online.de>
pkgbase=antlr2
pkgname=(antlr2 antlr2-{java,python2,cxx,sharp})
diff --git a/libre/apache-ant/PKGBUILD b/libre/apache-ant/PKGBUILD
index a2f3ab732..7601f526a 100644
--- a/libre/apache-ant/PKGBUILD
+++ b/libre/apache-ant/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
-# Contributor: Andrew Wright <andreww@photism.org>
+# Contributor (Arch): Andrew Wright <andreww@photism.org>
pkgname=apache-ant
pkgver=1.9.4
diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD
index bf8047f24..d10fb8ade 100644
--- a/libre/arora-libre/PKGBUILD
+++ b/libre/arora-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=arora
pkgname=arora-libre
diff --git a/libre/atool-libre/PKGBUILD b/libre/atool-libre/PKGBUILD
index a4f48a7a2..2255022b6 100644
--- a/libre/atool-libre/PKGBUILD
+++ b/libre/atool-libre/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: leif_thande <leif.thande@gmail.com>
-# Contributor: tranquility <trankas@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): leif_thande <leif.thande@gmail.com>
+# Contributor (Arch): tranquility <trankas@gmail.com>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
_pkgname=atool
pkgname=atool-libre
diff --git a/libre/atril-libre/PKGBUILD b/libre/atril-libre/PKGBUILD
index 2688a84c7..a082a1bce 100644
--- a/libre/atril-libre/PKGBUILD
+++ b/libre/atril-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 106531 2014-03-05 20:16:04Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Martin Wimpress <code@flexion.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=atril
pkgname=atril-libre
diff --git a/libre/audacious-plugins-libre/PKGBUILD b/libre/audacious-plugins-libre/PKGBUILD
index 71513d77f..0760361a1 100644
--- a/libre/audacious-plugins-libre/PKGBUILD
+++ b/libre/audacious-plugins-libre/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 211911 2014-04-29 17:16:51Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer (Parabola): Brendan Tildesley
-# Contributor (Parabola): Jorge Lopez <jorginho@parabola.nu>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
+# Contributor (Arch): William Rea <sillywilly@gmail.com>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: Brendan Tildesley
+# Contributor: Jorge Lopez <jorginho@parabola.nu>
_pkgname=audacious-plugins
pkgname=audacious-plugins-libre
diff --git a/libre/audex-libre/PKGBUILD b/libre/audex-libre/PKGBUILD
index 1f904de6a..df50539b9 100644
--- a/libre/audex-libre/PKGBUILD
+++ b/libre/audex-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 106445 2014-03-03 14:51:50Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: mightyjaym <jmambrosino@gmail.com>
-# Contributor: moostik <mooostik_at_gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Laurent Carlier <lordheavym@gmail.com>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): mightyjaym <jmambrosino@gmail.com>
+# Contributor (Arch): moostik <mooostik_at_gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=audex
pkgname=audex-libre
diff --git a/libre/audio-convert-libre/PKGBUILD b/libre/audio-convert-libre/PKGBUILD
index 2f1a9e1d6..d6807b701 100644
--- a/libre/audio-convert-libre/PKGBUILD
+++ b/libre/audio-convert-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 91081 2013-05-18 21:26:27Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Igor Galic <i.galic@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): Igor Galic <i.galic@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=audio-convert
pkgname=audio-convert-libre
diff --git a/libre/avidemux-libre/PKGBUILD b/libre/avidemux-libre/PKGBUILD
index 797135fd3..f4c612093 100644
--- a/libre/avidemux-libre/PKGBUILD
+++ b/libre/avidemux-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 208659 2014-03-24 20:18:17Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgbase=avidemux
pkgbase=avidemux-libre
diff --git a/libre/avidemux-libre/PKGBUILD.WIP b/libre/avidemux-libre/PKGBUILD.WIP
index e08bbc795..2929c4e22 100644
--- a/libre/avidemux-libre/PKGBUILD.WIP
+++ b/libre/avidemux-libre/PKGBUILD.WIP
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 160693 2012-06-03 22:00:17Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgbase=avidemux
pkgbase=avidemux-libre
diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD
index 3cc49d88f..e054cb2c7 100644
--- a/libre/bbswitch-libre/PKGBUILD
+++ b/libre/bbswitch-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 108708 2014-04-01 22:26:43Z thomas $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: M0Rf30
-# Contributor: Samsagax <samsagax@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor (Arch): M0Rf30
+# Contributor (Arch): Samsagax <samsagax@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=bbswitch
pkgname=bbswitch-libre
diff --git a/libre/bfgminer-libre/PKGBUILD b/libre/bfgminer-libre/PKGBUILD
index ffab0642d..e29ba491e 100644
--- a/libre/bfgminer-libre/PKGBUILD
+++ b/libre/bfgminer-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 106211 2014-02-25 15:02:06Z bpiotrowski $
-# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com>
-# Contributor: Andy Weidenbaum <archbaum@gmail.com>
+# Maintainer (Arch): Timothy Redaelli <timothy.redaelli@gmail.com>
+# Contributor (Arch): Andy Weidenbaum <archbaum@gmail.com>
_pkgname=bfgminer
pkgname=bfgminer-libre
diff --git a/libre/bitlbee-libre/PKGBUILD b/libre/bitlbee-libre/PKGBUILD
index bdab365ea..0a5e6d5f8 100644
--- a/libre/bitlbee-libre/PKGBUILD
+++ b/libre/bitlbee-libre/PKGBUILD
@@ -1,12 +1,12 @@
# $Id: PKGBUILD 202378 2013-12-21 14:01:44Z andyrtr $
-# Contributor: FUBAR <mrfubar@gmail.com>
-# Contributor: simo <simo@archlinux.org>
-# Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Arch): FUBAR <mrfubar@gmail.com>
+# Contributor (Arch): simo <simo@archlinux.org>
+# Contributor (Arch): Jeff 'codemac' Mickey <jeff@archlinux.org>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_pkgname=bitlbee
pkgname=bitlbee-libre
diff --git a/libre/blackbox-libre/PKGBUILD b/libre/blackbox-libre/PKGBUILD
index f7e9c056c..2ab972baf 100644
--- a/libre/blackbox-libre/PKGBUILD
+++ b/libre/blackbox-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 100133 2013-11-01 20:20:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: durbatuluk <dvdscripter@gmail.org>
-# Contributor: Steve Ponsford <sp4d@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): durbatuluk <dvdscripter@gmail.org>
+# Contributor (Arch): Steve Ponsford <sp4d@lavabit.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_pkgname=blackbox
pkgname=${_pkgname}-libre
diff --git a/libre/bogofilter-libre/PKGBUILD b/libre/bogofilter-libre/PKGBUILD
index 357e49752..086cc1cd7 100644
--- a/libre/bogofilter-libre/PKGBUILD
+++ b/libre/bogofilter-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 196818 2013-10-20 08:27:26Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: Low Kian Seong <fastmail_low@speedymail.org>
+# Maintainer (Arch): AndyRTR <andyrtr@archlinux.org>
+# Contributor (Arch): tobias <tobias@archlinux.org>
+# Contributor (Arch): Low Kian Seong <fastmail_low@speedymail.org>
_pkgname=bogofilter
pkgname=bogofilter-libre
diff --git a/libre/bumblebee-libre/PKGBUILD b/libre/bumblebee-libre/PKGBUILD
index 4bebcc704..70158aac1 100644
--- a/libre/bumblebee-libre/PKGBUILD
+++ b/libre/bumblebee-libre/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=bumblebee
pkgname=bumblebee-libre
diff --git a/libre/cacert-dot-org/PKGBUILD b/libre/cacert-dot-org/PKGBUILD
index 421b46942..c55ddf9a4 100644
--- a/libre/cacert-dot-org/PKGBUILD
+++ b/libre/cacert-dot-org/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Prurigro
-# Contributor: Neal <neal.oakey-at-oakey-dev.de>
+# Maintainer (Arch): Prurigro
+# Contributor (Arch): Neal <neal.oakey-at-oakey-dev.de>
pkgname=cacert-dot-org
pkgver=20140223
diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD
index 710f22fc2..1953532e1 100644
--- a/libre/calibre-libre/PKGBUILD
+++ b/libre/calibre-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 110925 2014-05-09 19:15:05Z jelle $
-# Maintainer: Jelle van der Waa <jelle@vdwaa.nl>
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Petrov Roman <nwhisper@gmail.com>
-# Contributor: Andrea Fagiani <andfagiani _at_ gmail dot com>
-# Contributor: Larry Hajali <larryhaja@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl>
+# Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
+# Contributor (Arch): Petrov Roman <nwhisper@gmail.com>
+# Contributor (Arch): Andrea Fagiani <andfagiani _at_ gmail dot com>
+# Contributor (Arch): Larry Hajali <larryhaja@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=calibre
pkgname=calibre-libre
diff --git a/libre/cdrkit-libre/PKGBUILD b/libre/cdrkit-libre/PKGBUILD
index a598a15f6..d64f0018e 100644
--- a/libre/cdrkit-libre/PKGBUILD
+++ b/libre/cdrkit-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 186761 2013-05-31 04:50:41Z allan $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
_pkgname=cdrkit
pkgname=cdrkit-libre
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 1a693a6d5..a54b2b1ad 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 110102 2014-04-24 07:51:18Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: BlackEagle <ike.devolder@gmail.com>
-# Contributor: Dany Martineau <dany.luc.martineau@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Kete <kete@ninthfloor.org>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
+# Contributor (Arch): Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor (Arch): BlackEagle <ike.devolder@gmail.com>
+# Contributor (Arch): Dany Martineau <dany.luc.martineau@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Kete <kete@ninthfloor.org>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgname=clementine
pkgname=clementine-libre
diff --git a/libre/crosstool-ng/PKGBUILD b/libre/crosstool-ng/PKGBUILD
index 5147cce61..5f4fa3ab7 100644
--- a/libre/crosstool-ng/PKGBUILD
+++ b/libre/crosstool-ng/PKGBUILD
@@ -1,6 +1,6 @@
-# Contributor: jwwolf <jwwolf+arch@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Arch): jwwolf <jwwolf+arch@gmail.com>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=crosstool-ng
pkgver=1.19.0
diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD
index f41ab02e0..9c8ae1354 100644
--- a/libre/cups-filters-libre/PKGBUILD
+++ b/libre/cups-filters-libre/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 211789 2014-04-26 10:47:56Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
pkgname=cups-filters-libre
_pkgname=cups-filters
diff --git a/libre/doublecmd-libre/PKGBUILD b/libre/doublecmd-libre/PKGBUILD
index 8bfb6697f..f5c5a16c5 100644
--- a/libre/doublecmd-libre/PKGBUILD
+++ b/libre/doublecmd-libre/PKGBUILD
@@ -1,7 +1,7 @@
# vim:set ft=sh:
# $Id: PKGBUILD 111059 2014-05-12 18:14:06Z idevolder $
-# Maintainer: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
-# Contributor: (sirocco AT ngs.ru)
+# Maintainer (Arch): BlackIkeEagle <ike DOT devolder AT gmail DOT com>
+# Contributor (Arch): (sirocco AT ngs.ru)
_pkgbase=doublecmd
pkgbase=doublecmd-libre
diff --git a/libre/dvdrip-libre/PKGBUILD b/libre/dvdrip-libre/PKGBUILD
index 06dee1752..3ec202039 100644
--- a/libre/dvdrip-libre/PKGBUILD
+++ b/libre/dvdrip-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 102182 2013-12-06 12:17:23Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Fredrik Hammar <Horney_C86@Hotmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Giovanni Scafora <giovanni@archlinux.org>
+# Contributor (Arch): Fredrik Hammar <Horney_C86@Hotmail.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_pkgname=dvdrip
pkgname=dvdrip-libre
diff --git a/libre/dvdrtools-libre/PKGBUILD b/libre/dvdrtools-libre/PKGBUILD
index 63a3fba1d..81fb29999 100644
--- a/libre/dvdrtools-libre/PKGBUILD
+++ b/libre/dvdrtools-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 78820 2012-10-25 06:47:28Z foutrelis $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
+# Contributor (Arch): dorphell <dorphell@archlinux.org>
+# Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=dvdrtools
pkgname=dvdrtools-libre
diff --git a/libre/ecasound-libre/PKGBUILD b/libre/ecasound-libre/PKGBUILD
index 480a80553..029fc5643 100644
--- a/libre/ecasound-libre/PKGBUILD
+++ b/libre/ecasound-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 205044 2014-02-03 17:11:21Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
+# Contributor (Arch): Eric Belanger <eric@archlinux.org>
+# Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=ecasound
pkgname=ecasound-libre
diff --git a/libre/engrampa-libre/PKGBUILD b/libre/engrampa-libre/PKGBUILD
index a9b18d1bf..3a5a35e21 100644
--- a/libre/engrampa-libre/PKGBUILD
+++ b/libre/engrampa-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 107641 2014-03-18 11:10:40Z flexiondotorg $
-# Maintainer : Martin Wimpress <code@flexion.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Martin Wimpress <code@flexion.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=engrampa
pkgname=engrampa-libre
diff --git a/libre/epdfview-libre/PKGBUILD b/libre/epdfview-libre/PKGBUILD
index c3e4e2bb3..b5ab969a6 100644
--- a/libre/epdfview-libre/PKGBUILD
+++ b/libre/epdfview-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 105182 2014-02-02 12:39:48Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: schuay <jakob.gruber@gmail.com>
-# Contributor: Tom K <tomk@runbox.com>
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+# Contributor (Arch): schuay <jakob.gruber@gmail.com>
+# Contributor (Arch): Tom K <tomk@runbox.com>
+# Contributor (Arch): Thayer Williams <thayer@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
pkgname=epdfview-libre
_pkgname=epdfview
diff --git a/libre/epiphany-libre/PKGBUILD b/libre/epiphany-libre/PKGBUILD
index c26e135ba..54c337d9f 100644
--- a/libre/epiphany-libre/PKGBUILD
+++ b/libre/epiphany-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 209155 2014-03-29 20:13:41Z heftig $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgname=epiphany
pkgname=epiphany-libre
diff --git a/libre/evince-libre/PKGBUILD b/libre/evince-libre/PKGBUILD
index db40386a7..d63bd54d9 100644
--- a/libre/evince-libre/PKGBUILD
+++ b/libre/evince-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 210357 2014-04-14 17:00:49Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=evince
pkgname=evince-libre
diff --git a/libre/file-roller-libre/PKGBUILD b/libre/file-roller-libre/PKGBUILD
index d49171165..61a93256a 100644
--- a/libre/file-roller-libre/PKGBUILD
+++ b/libre/file-roller-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 210597 2014-04-15 08:53:40Z jgc $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
_pkgname=file-roller
pkgname=file-roller-libre
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 69edeeb16..1ed9e7d46 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 180021 2013-03-14 19:23:11Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
+# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=filesystem
pkgver=2013.05
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
index d620fced6..63fbe916e 100644
--- a/libre/gloobus-preview-libre/PKGBUILD
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 104564 2014-01-22 21:49:14Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
_pkgname=gloobus-preview
pkgname=gloobus-preview-libre
diff --git a/libre/gnome-boxes-libre/PKGBUILD b/libre/gnome-boxes-libre/PKGBUILD
index 370d9fa7b..2e516655e 100644
--- a/libre/gnome-boxes-libre/PKGBUILD
+++ b/libre/gnome-boxes-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 109557 2014-04-15 23:23:01Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Stefano Facchini <stefano.facchini@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Daniel Milewski <niitotantei@gmail.com>
+# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Daniel Milewski <niitotantei@gmail.com>
_pkgname=gnome-boxes
pkgname=gnome-boxes-libre
diff --git a/libre/gnome-menus/PKGBUILD b/libre/gnome-menus/PKGBUILD
index 186473b5b..07f64ea10 100644
--- a/libre/gnome-menus/PKGBUILD
+++ b/libre/gnome-menus/PKGBUILD
@@ -1,5 +1,5 @@
# $Id$
-# Maintainer: Jan de Groot <jan@archlinux.org>
+# Maintainer (Arch): Jan de Groot <jan@archlinux.org>
pkgname=gnome-menus
pkgver=3.6.2
diff --git a/libre/gnormalize-libre/PKGBUILD b/libre/gnormalize-libre/PKGBUILD
index de98db9b0..36219be72 100644
--- a/libre/gnormalize-libre/PKGBUILD
+++ b/libre/gnormalize-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 91575 2013-05-24 12:41:56Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Chris Brannon <cmbrannon79@gmail.com>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor:JZsolt Varadi (karmaxxl)
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Chris Brannon <cmbrannon79@gmail.com>
+# Contributor (Arch): Corrado Primier <bardo@aur.archlinux.org>
+# Contributor (Arch):JZsolt Varadi (karmaxxl)
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=gnormalize
pkgname=gnormalize-libre
diff --git a/libre/grub-legacy/PKGBUILD b/libre/grub-legacy/PKGBUILD
index 57aaa2840..41c63052a 100644
--- a/libre/grub-legacy/PKGBUILD
+++ b/libre/grub-legacy/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 142375 2011-11-08 22:04:23Z ronald $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: ava1ar <mail(dot)avatar(at)gmail(dot)com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
+# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
+# Maintainer (Arch): ava1ar <mail(dot)avatar(at)gmail(dot)com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Jorge López <jorginho@lavabit.com>
pkgname=grub-legacy
_srcname=grub
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index c7960f88c..f105a8932 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer : Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
+# Contributor (Arch): Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgver="2.02"
_GRUB_GIT_TAG="grub-2.02-beta2"
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index 4d60e74ab..fe437a478 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 211613 2014-04-21 16:52:40Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_pkgname=gst-plugins-bad
pkgname=$_pkgname-libre
diff --git a/libre/gstreamer0.10-bad-libre/PKGBUILD b/libre/gstreamer0.10-bad-libre/PKGBUILD
index ead094736..3c8d52824 100644
--- a/libre/gstreamer0.10-bad-libre/PKGBUILD
+++ b/libre/gstreamer0.10-bad-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 207669 2014-03-12 23:48:57Z foutrelis $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgbase=gstreamer0.10-bad-libre
pkgname=('gstreamer0.10-bad-libre' 'gstreamer0.10-bad-libre-plugins')
diff --git a/libre/gummiboot/PKGBUILD b/libre/gummiboot/PKGBUILD
index 7792e37f9..6fe1a376b 100644
--- a/libre/gummiboot/PKGBUILD
+++ b/libre/gummiboot/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 210183 2014-04-10 18:38:19Z bpiotrowski $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor: Mantas Mikulėnas <grawity@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Contributor (Arch): Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor (Arch): Mantas Mikulėnas <grawity@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=gummiboot
pkgver=44
diff --git a/libre/hardinfo/PKGBUILD b/libre/hardinfo/PKGBUILD
index 99451eced..cd6fb5264 100644
--- a/libre/hardinfo/PKGBUILD
+++ b/libre/hardinfo/PKGBUILD
@@ -1,6 +1,6 @@
# $Id$
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=hardinfo
pkgver=0.5.1
diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index 4b5485ecd..336cb4dd6 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 107420 2014-03-17 10:06:48Z alucryd $
-# Maintainer: Maxime Gauduin <alucryd@gmail.com>
-# Contributor: TingPing <tingping@tingping.se>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Maxime Gauduin <alucryd@gmail.com>
+# Contributor (Arch): TingPing <tingping@tingping.se>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=hexchat
pkgname=hexchat-libre
diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD
index d7e765c8f..89fb50fd2 100644
--- a/libre/hplip-libre/PKGBUILD
+++ b/libre/hplip-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 210088 2014-04-09 19:22:29Z andyrtr $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor : Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
+# Maintainer (Arch): Tom Gundersen <teg@jklm.no>
+# Contributor (Arch): Rémy Oudompheng <remy@archlinux.org>
+# Contributor (Arch): Morgan LEFIEUX <comete@archlinuxfr.org>
+# Maintainer: Jorge López <jorginho@lavabit.com>
_pkgname=hplip
pkgname=hplip-libre
diff --git a/libre/hydrogen-libre/PKGBUILD b/libre/hydrogen-libre/PKGBUILD
index 95308eb70..df866a6c1 100644
--- a/libre/hydrogen-libre/PKGBUILD
+++ b/libre/hydrogen-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 184270 2013-05-05 10:45:11Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
+# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
+# Contributor (Arch): tobias <tobias@archlinux.org>
+# Contributor (Arch): K. Piche <kpiche@rogers.com>
+# Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org>
_pkgname=hydrogen
pkgname=hydrogen-libre
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
index 183c83019..935584aa1 100644
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ b/libre/icecat-adblock-plus/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=icecat-adblock-plus
pkgver=2.6
diff --git a/libre/icecat-firebug/PKGBUILD b/libre/icecat-firebug/PKGBUILD
index 838440097..ebe8a4fc9 100644
--- a/libre/icecat-firebug/PKGBUILD
+++ b/libre/icecat-firebug/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=icecat-firebug
pkgver=1.12.8
diff --git a/libre/icecat-noscript/PKGBUILD b/libre/icecat-noscript/PKGBUILD
index 6e81dd7d8..4cb2d6e8e 100644
--- a/libre/icecat-noscript/PKGBUILD
+++ b/libre/icecat-noscript/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 110713 2014-05-05 11:29:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=icecat-noscript
diff --git a/libre/icecat-raismth/PKGBUILD b/libre/icecat-raismth/PKGBUILD
index 83b545767..fb2e072d5 100644
--- a/libre/icecat-raismth/PKGBUILD
+++ b/libre/icecat-raismth/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=icecat-raismth
pkgver=4.0.1
diff --git a/libre/icecat-spell-ru/PKGBUILD b/libre/icecat-spell-ru/PKGBUILD
index 5b088817a..ecb7a2607 100644
--- a/libre/icecat-spell-ru/PKGBUILD
+++ b/libre/icecat-spell-ru/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maciej Sitarz <macieks@freesco.pl>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Maciej Sitarz <macieks@freesco.pl>
pkgname=icecat-spell-ru
pkgver=0.4.4
diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index 4dbe6009e..5422c8a99 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -1,10 +1,10 @@
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: vando <facundo@esdebian.org>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
index b965a4ea1..3b2077b2a 100644
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ b/libre/iceweasel-adblock-plus/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 110697 2014-05-05 09:47:45Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
pkgname=iceweasel-adblock-plus
pkgver=2.6
diff --git a/libre/iceweasel-firebug/PKGBUILD b/libre/iceweasel-firebug/PKGBUILD
index 73eb462d4..2c897ae21 100644
--- a/libre/iceweasel-firebug/PKGBUILD
+++ b/libre/iceweasel-firebug/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 111003 2014-05-11 21:13:52Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=iceweasel-firebug
pkgver=1.12.8
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 43c166210..3a2fcaa9f 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
# Contributor (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: vando <facundo@esdebian.org>
# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
# Contributor: Figue <ffigue at gmail>
# Thank you very much to the older contributors:
diff --git a/libre/iceweasel-noscript/PKGBUILD b/libre/iceweasel-noscript/PKGBUILD
index eec8b4f66..c80926c30 100644
--- a/libre/iceweasel-noscript/PKGBUILD
+++ b/libre/iceweasel-noscript/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 110713 2014-05-05 11:29:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=firefox-noscript
pkgname=iceweasel-noscript
diff --git a/libre/iceweasel-raismth/PKGBUILD b/libre/iceweasel-raismth/PKGBUILD
index ee3b9119e..377e452fd 100644
--- a/libre/iceweasel-raismth/PKGBUILD
+++ b/libre/iceweasel-raismth/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 101450 2013-11-25 21:16:28Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
pkgname=iceweasel-raismth
pkgver=4.0.1
diff --git a/libre/iceweasel-spell-ru/PKGBUILD b/libre/iceweasel-spell-ru/PKGBUILD
index b9bb8b6f9..4f759efd7 100644
--- a/libre/iceweasel-spell-ru/PKGBUILD
+++ b/libre/iceweasel-spell-ru/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 90907 2013-05-15 13:06:09Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Maciej Sitarz <macieks@freesco.pl>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Maciej Sitarz <macieks@freesco.pl>
pkgname=iceweasel-spell-ru
pkgver=0.4.4
diff --git a/libre/kdebase-konqueror-libre/PKGBUILD b/libre/kdebase-konqueror-libre/PKGBUILD
index 29524cd6d..0f8740785 100644
--- a/libre/kdebase-konqueror-libre/PKGBUILD
+++ b/libre/kdebase-konqueror-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname='kdebase-konqueror'
pkgname='kdebase-konqueror-libre'
diff --git a/libre/kdebase-runtime-libre/PKGBUILD b/libre/kdebase-runtime-libre/PKGBUILD
index f87a28b47..c52b94eca 100644
--- a/libre/kdebase-runtime-libre/PKGBUILD
+++ b/libre/kdebase-runtime-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 211506 2014-04-18 18:32:36Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdebase-runtime
pkgname=kdebase-runtime-libre
diff --git a/libre/kdelibs-libre/PKGBUILD b/libre/kdelibs-libre/PKGBUILD
index 89d33b41a..d0f8cd91a 100644
--- a/libre/kdelibs-libre/PKGBUILD
+++ b/libre/kdelibs-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdelibs
pkgname=kdelibs-libre
diff --git a/libre/kdenetwork-kopete-libre/PKGBUILD b/libre/kdenetwork-kopete-libre/PKGBUILD
index 1e3d9c978..b37dac11f 100644
--- a/libre/kdenetwork-kopete-libre/PKGBUILD
+++ b/libre/kdenetwork-kopete-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdenetwork-kopete
pkgname=kdenetwork-kopete-libre
diff --git a/libre/kdeutils-ark-libre/PKGBUILD b/libre/kdeutils-ark-libre/PKGBUILD
index 54b58cb5d..86ec10729 100644
--- a/libre/kdeutils-ark-libre/PKGBUILD
+++ b/libre/kdeutils-ark-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 210205 2014-04-11 16:54:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=kdeutils-ark
pkgname=kdeutils-ark-libre
diff --git a/libre/kile-libre/PKGBUILD b/libre/kile-libre/PKGBUILD
index 7bd98b5f5..f746bce87 100644
--- a/libre/kile-libre/PKGBUILD
+++ b/libre/kile-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 171256 2012-11-16 22:51:16Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
+# Contributor (Arch): Damir Perisa <damir.perisa@bluewin.ch>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
_pkgname=kile
pkgname=kile-libre
diff --git a/libre/kipi-plugins-libre/PKGBUILD b/libre/kipi-plugins-libre/PKGBUILD
index 55556c4b7..644bb58fe 100644
--- a/libre/kipi-plugins-libre/PKGBUILD
+++ b/libre/kipi-plugins-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 211141 2014-04-17 06:54:31Z andrea $
-# Maintainer: Ronald van Haren <ronald@archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=digikam
_pkgname=kipi-plugins
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD
index 7e33f3e8a..42b2d1569 100644
--- a/libre/lesspipe-libre/PKGBUILD
+++ b/libre/lesspipe-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 83837 2013-02-05 15:58:20Z spupykin $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor (Arch): solsTiCe d'Hiver <solstice.dhiver@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=lesspipe
pkgname=lesspipe-libre
diff --git a/libre/libosinfo-libre/PKGBUILD b/libre/libosinfo-libre/PKGBUILD
index 4d98acd64..5e759d2c2 100644
--- a/libre/libosinfo-libre/PKGBUILD
+++ b/libre/libosinfo-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 109557 2014-04-15 23:23:01Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Stefano Facchini <stefano.facchini@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor (Arch): Stefano Facchini <stefano.facchini@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# Contributor: Daniel Milewski <niitotantei@gmail.com>
_pkgname=libosinfo
diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD
index 5f44d0c5d..becd2420f 100644
--- a/libre/libquicktime-libre/PKGBUILD
+++ b/libre/libquicktime-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 108180 2014-03-24 09:50:56Z bpiotrowski $
-# Maintainer: Federico Cinelli <cinelli@aur.archlinux.org>
-# Maintainer: Mateusz Herych <heniekk@gmail.com>
-# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com>
+# Maintainer (Arch): Federico Cinelli <cinelli@aur.archlinux.org>
+# Maintainer (Arch): Mateusz Herych <heniekk@gmail.com>
+# Contributor: Jorge Lopez <jorginho@lavabit.com>
pkgname=libquicktime-libre
_pkgname=libquicktime
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index d6dd341fe..f1fdd8ebf 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -1,5 +1,5 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Joshua Haase <hahj87@gmail.com>
+# Contributor (Arch): Joshua Haase <hahj87@gmail.com>
# Contributor: fauno <fauno@kiwwwi.com.ar>
# Contributor: Márcio Silva <coadde@parabola.nu>
diff --git a/libre/licenses-libre/PKGBUILD b/libre/licenses-libre/PKGBUILD
index 19012126c..64acec522 100644
--- a/libre/licenses-libre/PKGBUILD
+++ b/libre/licenses-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 176952 2013-02-03 00:38:36Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Dan McGee <dan@archlinux.org>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=licenses-libre
pkgver=20130203
diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index cfb211c1f..f0c0b685a 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 211690 2014-04-23 14:07:47Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): bitlord
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Contributor: bitlord
+# Contributor: André Silva <emulatorman@parabola.nu>
_pkgname=liferea
pkgname=liferea-libre
diff --git a/libre/linux-libre-api-headers/PKGBUILD b/libre/linux-libre-api-headers/PKGBUILD
index 07cfe7988..245282994 100644
--- a/libre/linux-libre-api-headers/PKGBUILD
+++ b/libre/linux-libre-api-headers/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 211667 2014-04-23 02:10:08Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Allan McRae <allan@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
# toolchain build order: linux-libre-api-headers->glibc->binutils->gcc->binutils->glibc
diff --git a/libre/linux-libre-grsec/PKGBUILD b/libre/linux-libre-grsec/PKGBUILD
index e2b33c591..6f7e20edf 100644
--- a/libre/linux-libre-grsec/PKGBUILD
+++ b/libre/linux-libre-grsec/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer: Daniel Micay <danielmicay@gmail.com>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Thomas Baechler <thomas@archlinux.org>
-# Contributor: henning mueller <henning@orgizm.net>
-# Contributor: Thomas Dwyer http://tomd.tel
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Daniel Micay <danielmicay@gmail.com>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Contributor (Arch): Thomas Baechler <thomas@archlinux.org>
+# Contributor (Arch): henning mueller <henning@orgizm.net>
+# Contributor (Arch): Thomas Dwyer http://tomd.tel
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=linux-libre-grsec # Build stock -LIBRE-GRSEC kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 39e7da700..ed8d7474b 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 212335 2014-05-13 13:51:20Z bpiotrowski $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD
index 75c0dd12f..088f6c6c1 100644
--- a/libre/linux-libre-manpages/PKGBUILD
+++ b/libre/linux-libre-manpages/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 209733 2014-04-01 23:08:31Z thomas $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=linux-libre-manpages
pkgver=3.14
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
index ef8516155..5371822a3 100644
--- a/libre/linux-libre-tools/PKGBUILD
+++ b/libre/linux-libre-tools/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 109662 2014-04-17 21:37:35Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sébastien Luttringer <seblu@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgbase=linux-libre-tools
pkgname=(
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 12d843e82..d6b5755dc 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 212338 2014-05-13 15:06:31Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Sorin-Mihai Vârgolici <smv@yobicore.org>
-# Contributor (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Thomas Baechler <thomas@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Sorin-Mihai Vârgolici <smv@yobicore.org>
+# Contributor: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=linux-libre # Build stock -LIBRE kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD
index 5a629fd29..9ca6f8ff6 100644
--- a/libre/lirc-libre/PKGBUILD
+++ b/libre/lirc-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 209729 2014-04-01 21:55:59Z thomas $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Paul Mattal <paul@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgbase=lirc
pkgbase=lirc-libre
diff --git a/libre/lsb-release/PKGBUILD b/libre/lsb-release/PKGBUILD
index c6cbe5863..d35195267 100644
--- a/libre/lsb-release/PKGBUILD
+++ b/libre/lsb-release/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 101477 2013-11-26 10:23:04Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Malte Rabenseifner <malte@zearan.de>
-# Contributor: John Gerritse <reaphsharc@gmail.com>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva emulatorman@parabola.nu>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor (Arch): Malte Rabenseifner <malte@zearan.de>
+# Contributor (Arch): John Gerritse <reaphsharc@gmail.com>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva emulatorman@parabola.nu>
pkgname=lsb-release
pkgver=1.4
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index b70698a7c..d9edab932 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 108997 2014-04-09 10:03:56Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: flixie <69one@gmx.net>
-# Contributor: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor (Arch): flixie <69one@gmx.net>
+# Contributor (Arch): Imanol Celaya <ornitorrincos@archlinux-es.org>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_pkgname=luxrender
pkgname=$_pkgname-libre
pkgver=1.3.1
diff --git a/libre/mc-libre/PKGBUILD b/libre/mc-libre/PKGBUILD
index 2da038816..4ad1a0338 100644
--- a/libre/mc-libre/PKGBUILD
+++ b/libre/mc-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 108693 2014-04-01 12:31:56Z schuay $
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Arch): schuay <jakob.gruber@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgname=mc
pkgname=mc-libre
diff --git a/libre/mcomix-libre/PKGBUILD b/libre/mcomix-libre/PKGBUILD
index f28d7d2a3..c512a26cd 100644
--- a/libre/mcomix-libre/PKGBUILD
+++ b/libre/mcomix-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 106934 2014-03-10 18:30:38Z schuay $
-# Maintainer: schuay <jakob.gruber@gmail.com>
-# Contributor: Ray Powell <ray_al@xphoniexx.net>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): schuay <jakob.gruber@gmail.com>
+# Contributor (Arch): Ray Powell <ray_al@xphoniexx.net>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=mcomix
pkgname=mcomix-libre
diff --git a/libre/mesa-demos-libre/PKGBUILD b/libre/mesa-demos-libre/PKGBUILD
index 78ecbc563..2838b51b9 100644
--- a/libre/mesa-demos-libre/PKGBUILD
+++ b/libre/mesa-demos-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 178740 2013-02-26 16:15:13Z andyrtr $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname='mesa-demos-libre'
pkgver=8.1.0
diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-libre-gtk3/PKGBUILD
index 9909fe33a..938454573 100644
--- a/libre/midori-libre-gtk3/PKGBUILD
+++ b/libre/midori-libre-gtk3/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 108941 2014-04-07 21:25:27Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>
+# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com>
+# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=midori-gtk3
pkgname=midori-libre-gtk3
diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD
index fff7b0af6..9dd09b6dc 100644
--- a/libre/midori-libre/PKGBUILD
+++ b/libre/midori-libre/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 108939 2014-04-07 21:17:17Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: rabyte <rabyte.at.gmail.dot.com>
-# Contributor: Johannes Krampf <wuischke.at.amule.dot.org>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org>
+# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com>
+# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org>
+# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=midori
pkgname=midori-libre
diff --git a/libre/mime-types/PKGBUILD b/libre/mime-types/PKGBUILD
index 31e373545..1e6d45342 100644
--- a/libre/mime-types/PKGBUILD
+++ b/libre/mime-types/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 188113 2013-06-10 01:37:40Z bisson $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
pkgname=mime-types
pkgver=9
diff --git a/libre/mkisolinux/PKGBUILD b/libre/mkisolinux/PKGBUILD
index e2900d521..77e2c31b6 100644
--- a/libre/mkisolinux/PKGBUILD
+++ b/libre/mkisolinux/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 12670 2008-09-17 21:19:05Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=mkisolinux
pkgver=2013.05
diff --git a/libre/mkpxelinux/PKGBUILD b/libre/mkpxelinux/PKGBUILD
index 5596983b0..c0c30f18c 100644
--- a/libre/mkpxelinux/PKGBUILD
+++ b/libre/mkpxelinux/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 197074 2013-10-21 15:42:46Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=mkpxelinux
pkgver=2013.10
diff --git a/libre/mksyslinux/PKGBUILD b/libre/mksyslinux/PKGBUILD
index f01c844a9..4628c66e6 100644
--- a/libre/mksyslinux/PKGBUILD
+++ b/libre/mksyslinux/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 187120 2013-06-04 06:46:39Z tpowa $
-# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=mksyslinux
pkgver=2013.06
diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD
index a55f73b0c..7df354571 100644
--- a/libre/mozilla-searchplugins/PKGBUILD
+++ b/libre/mozilla-searchplugins/PKGBUILD
@@ -1,9 +1,9 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
# Contributor: Figue <ffigue at gmail>
# Contributor: Figue <ffigue at gmail>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: vando <facundo@esdebian.org>
+# Contributor: Márcio Silva <coadde@parabola.nu>
# Thank you very much to the older contributors:
# Contributor: evr <evanroman at gmail>
# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
diff --git a/libre/mplayer-libre-vaapi/PKGBUILD b/libre/mplayer-libre-vaapi/PKGBUILD
index 68873d749..1461c5ec7 100644
--- a/libre/mplayer-libre-vaapi/PKGBUILD
+++ b/libre/mplayer-libre-vaapi/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 108189 2014-03-24 13:39:00Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Evangelos Foutras <evangelos@foutrelis.com>
+# Contributor (Arch): Ionut Biru <ibiru@archlinux.org>
+# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Nicolás Reynolds <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgname=mplayer-vaapi
pkgname=mplayer-libre-vaapi
diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD
index 9c4dd49ab..5be143165 100644
--- a/libre/mplayer-libre/PKGBUILD
+++ b/libre/mplayer-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 208941 2014-03-28 21:27:08Z bpiotrowski $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Ionut Biru <ibiru@archlinux.org>
+# Maintainer (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgbase=mplayer
pkgbase=mplayer-libre
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index 78bd1d208..21cedb2a4 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 110427 2014-04-29 13:53:01Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Georgij Kondratjev <smpuj@bk.ru>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=netsurf
pkgname=netsurf-libre
diff --git a/libre/nss/PKGBUILD b/libre/nss/PKGBUILD
index 1344d4194..1676dc44d 100644
--- a/libre/nss/PKGBUILD
+++ b/libre/nss/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 212171 2014-05-09 18:25:02Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=nss
pkgver=3.16.1
diff --git a/libre/ogmrip-libre/PKGBUILD b/libre/ogmrip-libre/PKGBUILD
index b46ec2e6b..c5af35221 100644
--- a/libre/ogmrip-libre/PKGBUILD
+++ b/libre/ogmrip-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 103017 2013-12-25 16:56:14Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Daenyth
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# Contributor (Arch): Daenyth
+# Contributor (Arch): Allan McRae <allan@archlinux.org>
+# Contributor (Arch): Vrob (Markus Heuser) mheuser@mi.fu-berlin.de
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=ogmrip
pkgname=ogmrip-libre
diff --git a/libre/openexr-libre/PKGBUILD b/libre/openexr-libre/PKGBUILD
index 2f731939f..dfc8a8a19 100644
--- a/libre/openexr-libre/PKGBUILD
+++ b/libre/openexr-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 198354 2013-10-30 14:21:29Z allan $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=openexr
pkgname=openexr-libre
diff --git a/libre/openshot-libre/PKGBUILD b/libre/openshot-libre/PKGBUILD
index bcc77b027..473592202 100644
--- a/libre/openshot-libre/PKGBUILD
+++ b/libre/openshot-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 97284 2013-09-16 08:04:43Z bluewind $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Asa Marco <marcoasa90[at]gmail[.]com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Asa Marco <marcoasa90[at]gmail[.]com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=openshot
pkgname=openshot-libre
diff --git a/libre/oss-libre/PKGBUILD b/libre/oss-libre/PKGBUILD
index 7d1777b43..a2c7b10b5 100644
--- a/libre/oss-libre/PKGBUILD
+++ b/libre/oss-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 92058 2013-05-31 02:02:47Z seblu $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Florian Pritz <bluewind@xinu.at>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+# Contributor (Arch): Florian Pritz <bluewind@xinu.at>
+# Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=oss-libre
pkgver=4.2_2007
diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 5ea50cd1a..dc3e1562f 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $
-# Contributor: Thayer Williams <thayer@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-# Contributor: TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor (Arch): Thayer Williams <thayer@archlinux.org>
+# Contributor (Arch): Hugo Doria <hugo@archlinux.org>
+# Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr> 2007/11/17 21:22:36 UTC
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
pkgname=p7zip-libre
_pkgname=${pkgname%-libre}
diff --git a/libre/pacman-mirrorlist-libre/PKGBUILD b/libre/pacman-mirrorlist-libre/PKGBUILD
index 0b1ed8fad..819b737df 100644
--- a/libre/pacman-mirrorlist-libre/PKGBUILD
+++ b/libre/pacman-mirrorlist-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 193769 2013-08-30 15:44:51Z dan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Dan McGee <dan@archlinux.org>
+# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=pacman-mirrorlist-libre
pkgver=$(LC_ALL=C date -u +%Y%m%d)
diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 4f578475b..8fb58771b 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -1,7 +1,7 @@
# vim: set ts=2 sw=2 et:
# $Id: PKGBUILD 211992 2014-05-04 02:54:25Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
+# Maintainer (Arch): Dan McGee <dan@archlinux.org>
+# Maintainer (Arch): Dave Reisner <dreisner@archlinux.org>
pkgname=pacman
pkgver=4.1.2
diff --git a/libre/parabola-themes-slim/PKGBUILD b/libre/parabola-themes-slim/PKGBUILD
index a921253da..13aec2e8a 100644
--- a/libre/parabola-themes-slim/PKGBUILD
+++ b/libre/parabola-themes-slim/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Mark J.R.P. <l1mpm4rk@gmail.com>
-# Contributor: Mark J.R.P. <l1mpm4rk@gmail.com>
+# Maintainer (Arch): Mark J.R.P. <l1mpm4rk@gmail.com>
+# Contributor (Arch): Mark J.R.P. <l1mpm4rk@gmail.com>
provides=("parabola-themes-slim=$pkgver")
replaces=('archlinux-themes-slim')
diff --git a/libre/parabola-xdg-menu/PKGBUILD b/libre/parabola-xdg-menu/PKGBUILD
index b3085f9c3..002383804 100644
--- a/libre/parabola-xdg-menu/PKGBUILD
+++ b/libre/parabola-xdg-menu/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 101138 2013-11-18 10:37:13Z spupykin $
-# Maintainer: Sergej Pupykin <sergej@aur.archlinux.org>
-# Contributor: Sergej Pupykin <sergej@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <sergej@aur.archlinux.org>
+# Contributor (Arch): Sergej Pupykin <sergej@aur.archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=parabola-xdg-menu
pkgver=0.7.6.2
diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
index 833a6f56b..dcc63a9ea 100644
--- a/libre/parabolaiso/PKGBUILD
+++ b/libre/parabolaiso/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
+# Maintainer (Arch): Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
+# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: Esteban Carnevale <alfplayer@mailoo.org>
pkgname=parabolaiso
pkgver=2013.09.01
diff --git a/libre/ponysay-libre/PKGBUILD b/libre/ponysay-libre/PKGBUILD
index 885fdb3dd..f802dc365 100644
--- a/libre/ponysay-libre/PKGBUILD
+++ b/libre/ponysay-libre/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Erkin Batu Altunbaş <erkinbatu@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Contributor (Arch): Erkin Batu Altunbaş <erkinbatu@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
_pkgname=ponysay
pkgname=ponysay-libre
diff --git a/libre/povray-libre/PKGBUILD b/libre/povray-libre/PKGBUILD
index c75973f60..e68afa864 100644
--- a/libre/povray-libre/PKGBUILD
+++ b/libre/povray-libre/PKGBUILD
@@ -1,11 +1,11 @@
# $Id: PKGBUILD 101605 2013-11-29 04:23:22Z eric $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Contributor: tobias <tobias@archlinux.org>
-# Contributor: red_over_blue
-# Contributor: neri
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
+# Contributor (Arch): tobias <tobias@archlinux.org>
+# Contributor (Arch): red_over_blue
+# Contributor (Arch): neri
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
# Don't build povray before 3.7 version (that ones are nonfree software)
_pkgname=povray
diff --git a/libre/psi/PKGBUILD b/libre/psi/PKGBUILD
index c4150075f..e5903d9d5 100644
--- a/libre/psi/PKGBUILD
+++ b/libre/psi/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 196956 2013-10-21 11:28:57Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=psi
pkgver=0.15
diff --git a/libre/psutils-libre/PKGBUILD b/libre/psutils-libre/PKGBUILD
index 0d61ca098..90b204183 100644
--- a/libre/psutils-libre/PKGBUILD
+++ b/libre/psutils-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 176972 2013-02-03 07:11:03Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: eric <eric@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): xihh <hahj87@gmail.com>
+# Maintainer (Arch): Ronald van Haren <ronald.archlinux.org>
+# Contributor (Arch): eric <eric@archlinux.org>
+# Contributor (Arch): Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: xihh <hahj87@gmail.com>
_pkgname=psutils
pkgname=psutils-libre
diff --git a/libre/python-reportlab-libre/PKGBUILD b/libre/python-reportlab-libre/PKGBUILD
index 3ce775f9e..5f749edbd 100644
--- a/libre/python-reportlab-libre/PKGBUILD
+++ b/libre/python-reportlab-libre/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 110391 2014-04-28 19:17:21Z jelle $
-# Maintainer:
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Arch):
+# Contributor (Arch): Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Contributor (Arch): William Rea <sillywilly@gmail.com>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
# Contributor: borgo <nomail>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor: André Silva <emulatorman@parabola.nu>
pkgbase=python-reportlab-libre
pkgname=(python2-reportlab-libre python-reportlab-libre)
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index f5956c8f2..b26cbfcc9 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 111093 2014-05-13 15:31:43Z speps $
-# Maintainer: speps <speps at aur dot archlinux dot org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): speps <speps at aur dot archlinux dot org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgbase=qupzilla
pkgbase=qupzilla-libre
diff --git a/libre/reflector/PKGBUILD b/libre/reflector/PKGBUILD
index 002607a7e..3fcfa4750 100644
--- a/libre/reflector/PKGBUILD
+++ b/libre/reflector/PKGBUILD
@@ -1,5 +1,5 @@
-#Maintainer: Xyne <ac xunilhcra enyx, backwards>
-#Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+#Maintainer (Arch): Xyne <ac xunilhcra enyx, backwards>
+#Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=reflector
pkgver=2014
pkgrel=4
diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD
index dcd34bcd1..1832d8fae 100644
--- a/libre/rp-pppoe-libre/PKGBUILD
+++ b/libre/rp-pppoe-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: orelien <aurelien.foret@wanadoo.fr>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
+# Contributor (Arch): orelien <aurelien.foret@wanadoo.fr>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=rp-pppoe
pkgname=rp-pppoe-libre
diff --git a/libre/ruby-rdiscount/PKGBUILD b/libre/ruby-rdiscount/PKGBUILD
index 449a717f7..966cf67ce 100644
--- a/libre/ruby-rdiscount/PKGBUILD
+++ b/libre/ruby-rdiscount/PKGBUILD
@@ -1,6 +1,6 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
# Maintainer (AUR): Alexsandr Pavlov <kidoz at mail dot ru>
-# Contributor: Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
+# Contributor (Arch): Massimiliano Torromeo <massimiliano.torromeo at gmail dot com>
_gemname=rdiscount
pkgname=ruby-$_gemname
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index 18356ed03..f9449455e 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 212210 2014-05-10 21:41:06Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: dorphell <dorphell@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor (Arch): Allan McRae <allan@archlinux.org>
+# Contributor (Arch): dorphell <dorphell@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
# Maintainer (Connochaetos): Henry Jensen <hjensen@connochaetos.org>
pkgname=sdl-libre
diff --git a/libre/soundkonverter-libre/PKGBUILD b/libre/soundkonverter-libre/PKGBUILD
index 364d1fa64..c0aea726b 100644
--- a/libre/soundkonverter-libre/PKGBUILD
+++ b/libre/soundkonverter-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id: PKGBUILD 109579 2014-04-16 10:34:29Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: Darwin Bautista <djclue917@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Lukas Jirkovsky <l.jirkovsky@gmail.com>
+# Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
+# Contributor (Arch): Eric Belanger <eric@archlinux.org>
+# Contributor (Arch): Darwin Bautista <djclue917@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=soundkonverter
pkgname=soundkonverter-libre
diff --git a/libre/spectrwm-libre/PKGBUILD b/libre/spectrwm-libre/PKGBUILD
index 2a45650fe..ed632759b 100644
--- a/libre/spectrwm-libre/PKGBUILD
+++ b/libre/spectrwm-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 110857 2014-05-08 17:25:29Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
+# Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+# Contributor (Arch): Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
_pkgname=spectrwm
pkgname=spectrwm-libre
diff --git a/libre/stuntrally-data-libre/PKGBUILD b/libre/stuntrally-data-libre/PKGBUILD
index c63af4d5c..2ca986851 100644
--- a/libre/stuntrally-data-libre/PKGBUILD
+++ b/libre/stuntrally-data-libre/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=stuntrally-data-libre
_pkgname=stuntrally-data
diff --git a/libre/syslinux/PKGBUILD b/libre/syslinux/PKGBUILD
index 6b3b53b77..05c761fe1 100644
--- a/libre/syslinux/PKGBUILD
+++ b/libre/syslinux/PKGBUILD
@@ -1,7 +1,7 @@
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Thomas Bächler <thomas@archlinux.org>
+# Contributor (Arch): Keshav Padram Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname="syslinux"
pkgver="6.02"
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index f3b5eca26..03d829d53 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 211863 2014-04-28 15:07:05Z jgc $
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Contributor: francois <francois.archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
+# Contributor (Arch): francois <francois.archlinux.org>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
pkgname=texlive-bin-libre
pkgver=2013.30973
diff --git a/libre/texlive-core-libre/PKGBUILD b/libre/texlive-core-libre/PKGBUILD
index e56677d76..a5455426c 100644
--- a/libre/texlive-core-libre/PKGBUILD
+++ b/libre/texlive-core-libre/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
pkgname=texlive-core-libre
_pkgname=texlive-core
diff --git a/libre/texlive-fontsextra-libre/PKGBUILD b/libre/texlive-fontsextra-libre/PKGBUILD
index 40ef79a37..74969b3ef 100644
--- a/libre/texlive-fontsextra-libre/PKGBUILD
+++ b/libre/texlive-fontsextra-libre/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Rémy Oudompheng <remy.archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Rémy Oudompheng <remy.archlinux.org>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
pkgname=texlive-fontsextra-libre
_pkgname=texlive-fontsextra
diff --git a/libre/texlive-latexextra-libre/PKGBUILD b/libre/texlive-latexextra-libre/PKGBUILD
index 48756201a..7287e0019 100644
--- a/libre/texlive-latexextra-libre/PKGBUILD
+++ b/libre/texlive-latexextra-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 207649 2014-03-12 22:58:16Z remy $
-# Maintainer: Firmicus <firmicus āt gmx dōt net>
-# Maintainer: Rémy Oudompheng <remy@archlinux.org>
-# Maintainer (Parabola): Michał Masłowski <mtjm@mtjm.eu>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Firmicus <firmicus āt gmx dōt net>
+# Maintainer (Arch): Rémy Oudompheng <remy@archlinux.org>
+# Maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# Contributor: André Silva <emulatorman@parabola.nu>
pkgname=texlive-latexextra-libre
_pkgname=texlive-latexextra
diff --git a/libre/tokyocabinet/PKGBUILD b/libre/tokyocabinet/PKGBUILD
index 1add6c535..2ac531c2e 100644
--- a/libre/tokyocabinet/PKGBUILD
+++ b/libre/tokyocabinet/PKGBUILD
@@ -1,5 +1,5 @@
-# Maintainer: Mark Foxwell <fastfret79@archlinux.org.uk>
-# Contributor: Nicolas Martyanoff <khaelin@gmail.com>
+# Maintainer (Arch): Mark Foxwell <fastfret79@archlinux.org.uk>
+# Contributor (Arch): Nicolas Martyanoff <khaelin@gmail.com>
pkgname=tokyocabinet
pkgver=1.4.48
diff --git a/libre/tp_smapi-libre-lts/PKGBUILD b/libre/tp_smapi-libre-lts/PKGBUILD
index 75ba8520d..1e1a2eabc 100644
--- a/libre/tp_smapi-libre-lts/PKGBUILD
+++ b/libre/tp_smapi-libre-lts/PKGBUILD
@@ -1,13 +1,13 @@
# $Id: PKGBUILD 106775 2014-03-07 14:36:25Z bpiotrowski $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): xduugu
+# Contributor (Arch): nh2
+# Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com>
+# Contributor (Arch): Christof Musik <christof ð senfdax đ de>
+# Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=tp_smapi-libre-lts
_pkgname=tp_smapi
diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD
index c72249779..d52136e63 100644
--- a/libre/tp_smapi-libre/PKGBUILD
+++ b/libre/tp_smapi-libre/PKGBUILD
@@ -1,13 +1,13 @@
# $Id: PKGBUILD 108712 2014-04-01 22:34:00Z thomas $
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor (Arch): xduugu
+# Contributor (Arch): nh2
+# Contributor (Arch): Steven Davidovitz <steviedizzle ð gmail đ com>
+# Contributor (Arch): Nick B <Shirakawasuna ð gmail đ com>
+# Contributor (Arch): Christof Musik <christof ð senfdax đ de>
+# Contributor (Arch): Stefan Rupp <archlinux ð stefanrupp đ de>
+# Contributor (Arch): Ignas Anikevicius <anikevicius ð gmail đ com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=tp_smapi
pkgname=tp_smapi-libre
diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD
index 5ad3e3814..2c8dbdb16 100644
--- a/libre/unar/PKGBUILD
+++ b/libre/unar/PKGBUILD
@@ -1,6 +1,6 @@
-# Maintainer: Cedric Girard <girard.cedric@gmail.com>
-# Contributor: N30N <archlinux@alunamation.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Cedric Girard <girard.cedric@gmail.com>
+# Contributor (Arch): N30N <archlinux@alunamation.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
pkgname=unar
pkgver=1.8.1
diff --git a/libre/unzip-libre/PKGBUILD b/libre/unzip-libre/PKGBUILD
index 2c4ce4150..6b3cc76b0 100644
--- a/libre/unzip-libre/PKGBUILD
+++ b/libre/unzip-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 150452 2012-02-17 23:21:23Z allan $
-# Maintainer:
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: Robson Peixoto
+# Maintainer (Arch):
+# Contributor (Arch): Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor (Arch): Robson Peixoto
_pkgname=unzip
pkgname=unzip-libre
diff --git a/libre/usermin/PKGBUILD b/libre/usermin/PKGBUILD
index 578853285..3eaee9fc1 100644
--- a/libre/usermin/PKGBUILD
+++ b/libre/usermin/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 208134 2014-03-18 07:25:18Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=usermin
pkgver=1.590
pkgrel=1
diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD
index 49d31f45e..e94daedc2 100644
--- a/libre/vhba-module-libre/PKGBUILD
+++ b/libre/vhba-module-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 108714 2014-04-01 22:36:58Z thomas $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Mateusz Herych <heniekk@gmail.com>
-# Contributor: Charles Lindsay <charles@chaoslizard.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Ray Rashif <schiv@archlinux.org>
+# Contributor (Arch): Mateusz Herych <heniekk@gmail.com>
+# Contributor (Arch): Charles Lindsay <charles@chaoslizard.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=vhba-module
pkgname=vhba-module-libre
diff --git a/libre/vim-colorsamplerpack-libre/PKGBUILD b/libre/vim-colorsamplerpack-libre/PKGBUILD
index 3bfc552ff..0e9e6e2c8 100644
--- a/libre/vim-colorsamplerpack-libre/PKGBUILD
+++ b/libre/vim-colorsamplerpack-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 95528 2013-08-13 11:23:39Z svenstaro $
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Contributor (Arch): Aaron Griffin <aaron@archlinux.org>
+# Maintainer (Arch): Sven-Hendrik Haase <sh@lutzhaase.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=vim-colorsamplerpack
pkgname=vim-colorsamplerpack-libre
diff --git a/libre/vim-runtime/PKGBUILD b/libre/vim-runtime/PKGBUILD
index 893907179..3f5537820 100644
--- a/libre/vim-runtime/PKGBUILD
+++ b/libre/vim-runtime/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: tobias [ tobias at archlinux org ]
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Thomas Dziedzic <gostrc@gmail.com>
+# Contributor (Arch): Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor (Arch): tobias [ tobias at archlinux org ]
+# Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Márcio Silva <coadde@parabola.nu>
pkgbase=vim
pkgname=vim-runtime
diff --git a/libre/webmin/PKGBUILD b/libre/webmin/PKGBUILD
index 3cb9e787c..bc9307bcc 100644
--- a/libre/webmin/PKGBUILD
+++ b/libre/webmin/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 208132 2014-03-18 07:22:29Z tpowa $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer (Arch): Tobias Powalowski <tpowa@archlinux.org>
pkgname=webmin
pkgver=1.680
pkgrel=1
diff --git a/libre/wings3d-libre/PKGBUILD b/libre/wings3d-libre/PKGBUILD
index 1f750dfc4..5970c5bcb 100644
--- a/libre/wings3d-libre/PKGBUILD
+++ b/libre/wings3d-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 95697 2013-08-15 18:20:27Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: kappa <kappacurve@gmail.com>
-# Maintainer (Parabola): Márcio Silva <coadde@parabola.nu>
+# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
+# Contributor (Arch): kappa <kappacurve@gmail.com>
+# Maintainer: Márcio Silva <coadde@parabola.nu>
_name=wings
_pkgname=${_name}3d
diff --git a/libre/xarchiver-libre/PKGBUILD b/libre/xarchiver-libre/PKGBUILD
index f97fcf31c..a6965af8d 100644
--- a/libre/xarchiver-libre/PKGBUILD
+++ b/libre/xarchiver-libre/PKGBUILD
@@ -1,8 +1,8 @@
# $Id: PKGBUILD 111012 2014-05-12 01:13:40Z bgyorgy $
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Contributor: Andrew Simmons <andrew.simmons@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor (Arch): Alexander Fehr <pizzapunk gmail com>
+# Contributor (Arch): Andrew Simmons <andrew.simmons@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=xarchiver
pkgname=xarchiver-libre
diff --git a/libre/xbmc-libre-lts/PKGBUILD b/libre/xbmc-libre-lts/PKGBUILD
index 468dcb12d..bd0ab5108 100644
--- a/libre/xbmc-libre-lts/PKGBUILD
+++ b/libre/xbmc-libre-lts/PKGBUILD
@@ -1,9 +1,9 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
+# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer: André Silva <emulatorman@parabola.nu>
_prefix=/usr
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index bdbeaa430..1aff83340 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,10 +1,10 @@
# $Id: PKGBUILD 110974 2014-05-11 14:59:58Z idevolder $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackIkeEagle < ike DOT devolder AT gmail DOT com >
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor (Arch): Brad Fanella <bradfanella@archlinux.us>
+# Contributor (Arch): [vEX] <niechift.dot.vex.at.gmail.dot.com>
+# Contributor (Arch): Zeqadious <zeqadious.at.gmail.dot.com>
+# Contributor (Arch): BlackIkeEagle < ike DOT devolder AT gmail DOT com >
+# Maintainer: André Silva <emulatorman@parabola.nu>
_prefix=/usr
diff --git a/libre/xbmc-pvr-addons-lts/PKGBUILD b/libre/xbmc-pvr-addons-lts/PKGBUILD
index 540e90c45..7b647d7d9 100644
--- a/libre/xbmc-pvr-addons-lts/PKGBUILD
+++ b/libre/xbmc-pvr-addons-lts/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 110811 2014-05-07 15:05:32Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=xbmc-pvr-addons
pkgname=xbmc-pvr-addons-lts
diff --git a/libre/xchat-libre/PKGBUILD b/libre/xchat-libre/PKGBUILD
index 4f962dcb3..1214dc947 100644
--- a/libre/xchat-libre/PKGBUILD
+++ b/libre/xchat-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 186065 2013-05-20 20:17:32Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=xchat
pkgname=xchat-libre
diff --git a/libre/xmlstarlet/PKGBUILD b/libre/xmlstarlet/PKGBUILD
index a06daf063..76595486f 100644
--- a/libre/xmlstarlet/PKGBUILD
+++ b/libre/xmlstarlet/PKGBUILD
@@ -1,7 +1,7 @@
# From https://aur.archlinux.org/packages.php?ID=20101.
-# Maintainer: PyroPeter <abi1789@googlemail.com>
-# Contributor: BlackEagle <ike.devolder@scarlet.be>
-# Contributor: chochem <chochem@gmail.com>
+# Maintainer (Arch): PyroPeter <abi1789@googlemail.com>
+# Contributor (Arch): BlackEagle <ike.devolder@scarlet.be>
+# Contributor (Arch): chochem <chochem@gmail.com>
pkgname=xmlstarlet
pkgver=1.3.1
diff --git a/libre/xorg-fonts-100dpi-libre/PKGBUILD b/libre/xorg-fonts-100dpi-libre/PKGBUILD
index 3f88f1cee..066904a5a 100644
--- a/libre/xorg-fonts-100dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-100dpi-libre/PKGBUILD
@@ -1,7 +1,7 @@
# $Id: PKGBUILD 71678 2010-03-08 11:58:02Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
+# Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
pkgname=xorg-fonts-100dpi-libre
pkgver=1.0.3
pkgrel=2
diff --git a/libre/xorg-fonts-75dpi-libre/PKGBUILD b/libre/xorg-fonts-75dpi-libre/PKGBUILD
index c262229fc..6921b4ccc 100644
--- a/libre/xorg-fonts-75dpi-libre/PKGBUILD
+++ b/libre/xorg-fonts-75dpi-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 71681 2010-03-08 12:06:26Z jgc $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Alexander Baldeck <alexander@archlinux.org>
+# Contributor (Arch): Jan de Groot <jgc@archlinux.org>
pkgname=xorg-fonts-75dpi-libre
pkgver=1.0.3
pkgrel=2
diff --git a/libre/xorg-fonts-type1-libre/PKGBUILD b/libre/xorg-fonts-type1-libre/PKGBUILD
index 4904a4477..e38cc63e3 100644
--- a/libre/xorg-fonts-type1-libre/PKGBUILD
+++ b/libre/xorg-fonts-type1-libre/PKGBUILD
@@ -1,5 +1,5 @@
# $Id: PKGBUILD 150375 2012-02-17 09:54:09Z allan $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
pkgname=xorg-fonts-type1-libre
pkgver=7.4
diff --git a/libre/xscreensaver-libre/PKGBUILD b/libre/xscreensaver-libre/PKGBUILD
index 8ab5ec06a..7fb26c711 100644
--- a/libre/xscreensaver-libre/PKGBUILD
+++ b/libre/xscreensaver-libre/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 201451 2013-12-12 05:18:26Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
_pkgname=xscreensaver
pkgname=xscreensaver-libre
diff --git a/libre/xsp/PKGBUILD b/libre/xsp/PKGBUILD
index ef6fe97c2..93867938d 100644
--- a/libre/xsp/PKGBUILD
+++ b/libre/xsp/PKGBUILD
@@ -1,6 +1,6 @@
# $Id: PKGBUILD 188153 2013-06-10 16:36:32Z daniel $
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
+# Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org>
+# Contributor (Arch): Tobias Kieslich <tobias@justdreams.de>
pkgname=xsp
pkgver=3.0.11