diff -Nur /var/abs/community/docbook2x/PKGBUILD ./docbook2x/PKGBUILD
--- /var/abs/community/docbook2x/PKGBUILD	2010-06-24 23:40:46.000000000 -0430
+++ ./docbook2x/PKGBUILD	2010-06-26 05:25:19.000000000 -0430
@@ -12,31 +12,27 @@
 depends=('glibc' 'perl-sgmls' 'perlxml' 'perl-xml-sax' 'libxslt')
 makedepends=('texinfo')
 install=docbook2x.install
-source=(http://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz)
-md5sums=('b9b76a6af198c4f44574cfd17a322f01')
+source=(http://downloads.sourceforge.net/$pkgname/docbook2X-$pkgver.tar.gz
+        datadir.diff)
+md5sums=('b9b76a6af198c4f44574cfd17a322f01'
+         '826fae88a435d9278c4f9614991d55a1')
 
 build()  {
+  patch -p0 < datadir.diff
   cd $srcdir/docbook2X-$pkgver
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --program-transform-name 's,2x-,2,' \
+    #
+  make
+}
 
-  install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/license || return 1
-
-  ./configure  --prefix=/usr --mandir=/usr/share/man
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
-
-  # some fixes
-  cd $pkgdir/usr/bin && \
-  ln -s docbook2man docbook2x-man && \
-  ln -s docbook2texi docbook2x-texi && \
-  sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' db2x_xsltproc && \
-  sed -i 's|${prefix}|/usr|g' db2x_manxml && \
-  sed -i 's|${prefix}|/usr|g' db2x_texixml && \
-  sed -i 's|${prefix}|/usr|g' db2x_xsltproc && \
-  sed -i 's|${prefix}|/usr|g' docbook2man && \
-  sed -i 's|${prefix}|/usr|g' docbook2texi && \
-  sed -i 's|${prefix}|/usr|g' sgml2xml-isoent && \
-  sed -i 's|${prefix}|/usr|g' utf8trans || return 1
-
-  rm -f $pkgdir/usr/share/info/dir && \
-  gzip $pkgdir/usr/share/info/*.info || return 1
+package() {
+  cd $srcdir/docbook2X-$pkgver
+  make DESTDIR=$pkgdir install
+  install -D -m0644 COPYING $pkgdir/usr/share/licenses/$pkgname/license
+  sed -i 's|http://docbook2x.sf.net/latest|/usr/share/docbook2X|g' \
+    $pkgdir/usr/bin/db2x_xsltproc
 }
+
diff -Nur /var/abs/community/docbook2x/datadir.diff ./docbook2x/datadir.diff
--- /var/abs/community/docbook2x/datadir.diff	1969-12-31 20:00:00.000000000 -0400
+++ ./docbook2x/datadir.diff	2010-06-26 05:19:17.000000000 -0430
@@ -0,0 +1,18 @@
+Upstream patch:
+http://docbook2x.cvs.sourceforge.net/viewvc/docbook2x/docbook2X/configure.ac?r1=1.21&r2=1.22&view=patch
+
+diff -ru docbook2X-0.8.8.orig/configure.ac docbook2X-0.8.8/configure.ac
+--- docbook2X-0.8.8.orig/configure.ac	2010-06-26 04:57:04.000000000 -0430
++++ docbook2X-0.8.8/configure.ac	2010-06-26 04:57:39.000000000 -0430
+@@ -149,6 +149,11 @@
+ dnl Ensure that all static_* are fully expanded.
+ 
+ eval static_datadir="$datadir"
++old_val=""
++until test "$static_datadir" = "$old_val"; do
++	old_val="$static_datadir"
++	eval static_datadir="$static_datadir"
++done
+ 
+ eval static_bindir="$bindir"
+ old_val=""
diff -Nur /var/abs/community/docbook2x/docbook2x.install ./docbook2x/docbook2x.install
--- /var/abs/community/docbook2x/docbook2x.install	2010-06-24 23:40:47.000000000 -0430
+++ ./docbook2x/docbook2x.install	2010-06-26 05:33:29.000000000 -0430
@@ -1,4 +1,4 @@
-info_dir=/usr/share/info
+info_dir=usr/share/info
 info_files=(docbook2X.info docbook2man-xslt.info docbook2texi-xslt.info)
 
 post_install() {