diff --git a/pkg/arch/README.md b/pkg/arch/README.md
index 5f367d7ab..744947a0f 100644
--- a/pkg/arch/README.md
+++ b/pkg/arch/README.md
@@ -4,11 +4,11 @@ Primarily tested on Arch Linux + Surface Laptop 13" (Intel).
 
 ## Instructions
 
-- Building firmware & configs
+- Building firmware
   ```
-  cd surface
+  cd surface-ipts-firmware
   makepkg -s
-  sudo pacman -U surface-firmware*.pkg.tar.* surface-config*.pkg.tar.*
+  sudo pacman -U surface-ipts-firmware*.pkg.tar.*
   ```
 
 - Building the patched kernel (includes ACPI module)
diff --git a/pkg/arch/build.sh b/pkg/arch/build.sh
index e6e8644ad..b607971d6 100755
--- a/pkg/arch/build.sh
+++ b/pkg/arch/build.sh
@@ -10,7 +10,7 @@ echo "$GPG_KEY" | base64 -d | gpg --import --no-tty --batch --yes
 export GPG_TTY=$(tty)
 
 # Build the packages as `build' user
-pushd surface
+pushd surface-ipts-firmware
 makepkg -f --syncdeps --skippgpcheck --noconfirm
 # Sign as a separate step (makepkg -s needs pinentry)
 makepkg --packagelist | xargs -L1 gpg --detach-sign --batch --no-tty --pinentry-mode=loopback --passphrase $GPG_PASSPHRASE -u 5B574D1B513F9A05
diff --git a/pkg/arch/surface-ipts-firmware/PKGBUILD b/pkg/arch/surface-ipts-firmware/PKGBUILD
new file mode 100644
index 000000000..03749f34f
--- /dev/null
+++ b/pkg/arch/surface-ipts-firmware/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Blaž Hrastnik <blaz@mxxn.io>
+
+pkgname=surface-ipts-firmware
+pkgver=1.0.0
+pkgrel=1
+arch=(any)
+pkgdesc="Surface firmware"
+url="http://github.com/linux-surface/surface-ipts-firmware"
+license=(GPL2)
+_srcname=source
+_srcbranch='master'
+source=(
+  "$_srcname::git+https://github.com/linux-surface/surface-ipts-firmware.git#branch=$_srcbranch"
+)
+sha256sums=('SKIP')
+
+package() {
+  cd ${srcdir}/${_srcname}/
+  install -d "${pkgdir}/usr/lib/firmware/"
+  cp -r firmware/* "${pkgdir}/usr/lib/firmware/"
+}
diff --git a/pkg/arch/surface-ipts-firmware/README.md b/pkg/arch/surface-ipts-firmware/README.md
new file mode 100644
index 000000000..f552d2f0c
--- /dev/null
+++ b/pkg/arch/surface-ipts-firmware/README.md
@@ -0,0 +1 @@
+Builds `surface-ipts-firmware`
diff --git a/pkg/arch/surface/PKGBUILD b/pkg/arch/surface/PKGBUILD
deleted file mode 100644
index 95c448510..000000000
--- a/pkg/arch/surface/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Blaž Hrastnik <blaz@mxxn.io>
-
-pkgbase=surface
-pkgver=1.0.0
-pkgrel=1
-arch=(any)
-url="http://github.com/linux-surface/linux-surface"
-license=(GPL2)
-_srcname=source
-_srcbranch='master'
-source=(
-  "$_srcname::git+https://github.com/linux-surface/linux-surface.git#branch=$_srcbranch"
-)
-sha256sums=('SKIP')
-
-_package-firmware() {
-  pkgdesc="Surface firmware"
-  cd ${srcdir}/${_srcname}/
-  install -d "${pkgdir}/usr/lib/firmware/"
-  cp -r firmware/* "${pkgdir}/usr/lib/firmware/"
-}
-
-_package-config() {
-  pkgdesc="Surface config files"
-  cd ${srcdir}/${_srcname}/
-  cp -r root/etc "${pkgdir}/etc/"
-  install -d "${pkgdir}/usr/lib/"
-  cp -r root/lib/* "${pkgdir}/usr/lib/"
-}
-
-pkgname=("$pkgbase-firmware" "$pkgbase-config")
-for _p in "${pkgname[@]}"; do
-  eval "package_$_p() {
-    $(declare -f "_package${_p#$pkgbase}")
-    _package${_p#$pkgbase}
-  }"
-done
diff --git a/pkg/arch/surface/README.md b/pkg/arch/surface/README.md
deleted file mode 100644
index d169a6245..000000000
--- a/pkg/arch/surface/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Builds `surface-firmware` and `surface-config`.