diff --git a/etc/abs/Makefile.am b/etc/abs/Makefile.am
index 530540e0..b6b64f03 100644
--- a/etc/abs/Makefile.am
+++ b/etc/abs/Makefile.am
@@ -1,7 +1,7 @@
 EXTRA_DIST = \
 	abs.conf \
-	supfile.arch \
 	supfile.community \
+	supfile.core \
 	supfile.extra \
 	supfile.testing \
 	supfile.unstable
diff --git a/etc/abs/abs.conf b/etc/abs/abs.conf
index 66ba5277..782b269b 100644
--- a/etc/abs/abs.conf
+++ b/etc/abs/abs.conf
@@ -9,5 +9,5 @@
 # Supfiles to be parsed by abs (in this order)
 #   (prefix a module with a ! to disable it)
 #
-SUPFILES=(arch extra !unstable !community !testing)
+SUPFILES=(core extra !unstable !community !testing)
 
diff --git a/etc/abs/supfile.arch b/etc/abs/supfile.core
similarity index 67%
rename from etc/abs/supfile.arch
rename to etc/abs/supfile.core
index 4ab4e499..2e052bce 100644
--- a/etc/abs/supfile.arch
+++ b/etc/abs/supfile.core
@@ -1,8 +1,8 @@
 #
-# supfile.arch
+# supfile.core
 #
 
-# this is the host containing the current PKGBUILD files
+# this is the host containing the core PKGBUILD files
 *default host=cvs.archlinux.org
 
 *default release=cvs
@@ -12,4 +12,4 @@
 #*default umask=002
 
 *default tag=CURRENT
-arch
+core
diff --git a/etc/abs/supfile.testing b/etc/abs/supfile.testing
index d2fc6106..70fc6551 100644
--- a/etc/abs/supfile.testing
+++ b/etc/abs/supfile.testing
@@ -12,5 +12,5 @@
 #*default umask=002
 
 *default tag=TESTING
-arch
+core
 extra
diff --git a/etc/pacman.conf.in b/etc/pacman.conf.in
index 5c518ea3..7a775bfe 100644
--- a/etc/pacman.conf.in
+++ b/etc/pacman.conf.in
@@ -25,7 +25,7 @@ HoldPkg     = pacman glibc
 #[testing]
 #Include = @sysconfdir@/pacman.d/mirrorlist
 
-[current]
+[core]
 # Add your preferred servers here, they will be used first
 Include = @sysconfdir@/pacman.d/mirrorlist