--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@

 pkgname=ttf-dejavu
 pkgver=2.35
-pkgrel=1
+pkgrel=2
 pkgdesc="Font family based on the Bitstream Vera Fonts with a wider range of characters"
 arch=('any')
 url="http://dejavu-fonts.org/wiki/Main_Page"
@@ -18,11 +18,18 @@

 package() {
   install -dm755 "${pkgdir}"/etc/fonts/conf.avail
+  install -dm755 "${pkgdir}"/etc/fonts/conf.d
   install -dm755 "${pkgdir}"/usr/share/fonts/TTF

   cd "${srcdir}"/dejavu-fonts-ttf-${pkgver}
   install -m644 ttf/*.ttf "${pkgdir}"/usr/share/fonts/TTF/
   install -m644 fontconfig/*.conf "${pkgdir}"/etc/fonts/conf.avail/

+  pushd "${pkgdir}"/etc/fonts/conf.avail > /dev/null
+  for config in *; do
+    ln -sf ../conf.avail/${config} ../conf.d/${config}
+  done
+  popd > /dev/null
+
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
--- a/ttf-dejavu.install
+++ b/ttf-dejavu.install
@@ -5,53 +5,26 @@
          57-dejavu-sans.conf
          57-dejavu-serif.conf)

+pre_upgrade() {
+  if [ $(vercmp $2 2.35-2) -lt 0 ]; then
+    pushd etc/fonts/conf.d > /dev/null
+    for config in "${configs[@]}"; do
+      rm -f ${config}
+    done
+    popd > /dev/null
+  fi
+}
+
 post_install() {
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    ln -sf ../conf.avail/${config} .
-  done
-  popd > /dev/null
   fc-cache -s
   mkfontscale usr/share/fonts/TTF
   mkfontdir usr/share/fonts/TTF
 }

 post_upgrade() {
-  if [ `vercmp 2.30-2 $2` -gt 0 ]; then
-    pushd etc/fonts/conf.d > /dev/null
-    for config in "${configs[@]}"; do
-      ln -sf ../conf.avail/${config} .
-    done
-    popd > /dev/null
-  fi
-  for config in etc/fonts/conf.d/*; do
-    if [ ! -f ${config} ]; then
-      rm -f ${config}
-    fi
-  done
-  fc-cache -s
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-}
-
-pre_upgrade() {
-  # Link new config files not present on system yet
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    if [ ! -f ../conf.avail/${config} ]; then
-      ln -sf ../conf.avail/${config} .
-    fi
-  done
-  popd > /dev/null
+  post_install
 }

 post_remove() {
-  pushd etc/fonts/conf.d > /dev/null
-  for config in "${configs[@]}"; do
-    rm -f ${config}
-  done
-  popd > /dev/null
-  fc-cache -s
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
+  post_install
 }