diff --git a/srcpkgs/encodings/INSTALL b/srcpkgs/encodings/INSTALL
new file mode 100644
index 0000000000..43dfd2c372
--- /dev/null
+++ b/srcpkgs/encodings/INSTALL
@@ -0,0 +1,8 @@
+case "$ACTION" in
+post)
+	cd usr/share/fonts/X11/encodings/large
+	mkfontscale -b -s -l -n -r -p /usr/share/fonts/X11/encodings/large -e . .
+	cd ..
+	mkfontscale -b -s -l -n -r -p /usr/share/fonts/X11/encodings -e . -e large .
+	;;
+esac
diff --git a/srcpkgs/encodings/REMOVE b/srcpkgs/encodings/REMOVE
new file mode 100644
index 0000000000..55ed500c7a
--- /dev/null
+++ b/srcpkgs/encodings/REMOVE
@@ -0,0 +1,9 @@
+case "$ACTION" in
+pre)
+	if [ "$UPDATE" = "no" ]; then
+		# Remove encodings.dir files.
+		rm -f usr/share/fonts/X11/encodings/large/encodings.dir
+		rm -f usr/share/fonts/X11/encodings/encodings.dir
+	fi
+	;;
+esac
diff --git a/srcpkgs/encodings/template b/srcpkgs/encodings/template
index 18b75ec90f..2aacf43105 100644
--- a/srcpkgs/encodings/template
+++ b/srcpkgs/encodings/template
@@ -1,18 +1,27 @@
 # Template build file for 'encodings'.
 pkgname=encodings
 version=1.0.4
-distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
+revision=3
+noarch=yes
 build_style=gnu-configure
-fulldepends="mkfontscale"
-revision=2
+hostmakedepends="pkg-config"
+fulldepends="font-util"
 short_desc="X11 Font Index Generator"
 homepage="http://xorg.freedesktop.org"
 license="Public domain"
 maintainer="Juan RP <xtraeme@gmail.com>"
+distfiles="${XORG_SITE}/font/$pkgname-$version.tar.bz2"
 checksum=ced6312988a45d23812c2ac708b4595f63fd7a49c4dcd9f66bdcd50d1057d539
 long_desc="
  The package provides the X.org font encoding files, such as
  adobe-dingbats.enc.gz, ibm-cp866.enc, jisx0212.1990-0.enc.gz,
  and others. This is from the modular X.org project."
 
-noarch=yes
+pre_build() {
+	sed -e 's|^\(encodings_DATA = $(DATA_FILES)\).*|\1|' -i Makefile
+}
+
+post_install() {
+	# encodings.dir are generated at pkg post-install time.
+	find ${DESTDIR} -name encodings.dir -delete
+}