diff --git a/x11-libs/xtrans/xtrans-1.2.5.recipe b/x11-libs/xtrans/xtrans-1.2.5.recipe
deleted file mode 100644
index 1c589ef53..000000000
--- a/x11-libs/xtrans/xtrans-1.2.5.recipe
+++ /dev/null
@@ -1,54 +0,0 @@
-SUMMARY="X.Org's library to handle network protocol transport"
-DESCRIPTION="xtrans is a library of code that is shared among various X \
-packages to handle network protocol transport in a modular fashion, allowing \
-a single place to add new transport types.  It is used by the X server, \
-libX11, libICE, the X font server, and related components."
-HOMEPAGE="http://xorg.freedesktop.org/releases/individual/lib/"
-COPYRIGHT="1993, 1994, 1998  The Open Group
-	1993, 1994 NCR Corporation
-	2002, 2005 Sun Microsystems, Inc.
-	1996 Sebastien Marineau, Holger Veit
-	2003 Keith Packard, Noah Levitt"
-LICENSE="MIT (no promotion)"
-REVISION="1"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.5.tar.gz"
-CHECKSUM_SHA256="97d76ab76c755fabf2ef1896aaa76c0e38fc58d92799f9b2dd885a535cdd1e2b"
-
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
-
-PROVIDES="
-	xtrans$secondaryArchSuffix = $portVersion
-	devel:xtrans$secondaryArchSuffix = $portVersion
-	"
-REQUIRES="
-	haiku$secondaryArchSuffix
-	"
-
-BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	"
-BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
-	cmd:autoconf
-	cmd:libtool
-	cmd:aclocal
-	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
-	"
-
-BUILD()
-{
-	libtoolize --force --copy --install
-	autoreconf -i
-	runConfigure ./configure
-}
-
-INSTALL()
-{
-	make install
-	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
-	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
-}
diff --git a/x11-libs/xtrans/xtrans-1.3.5.recipe b/x11-libs/xtrans/xtrans-1.3.5.recipe
index b1cd6e34c..b6f3a5b72 100644
--- a/x11-libs/xtrans/xtrans-1.3.5.recipe
+++ b/x11-libs/xtrans/xtrans-1.3.5.recipe
@@ -10,46 +10,48 @@ COPYRIGHT="1993, 1994, 1998  The Open Group
 	1996 Sebastien Marineau, Holger Veit
 	2003 Keith Packard, Noah Levitt"
 LICENSE="MIT (no promotion)"
-REVISION="3"
-SOURCE_URI="http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.3.5.tar.gz"
-CHECKSUM_SHA256="b7a577c1b6c75030145e53b4793db9c88f9359ac49e7d771d4385d21b3e5945d"
-PATCHES="xtrans-1.3.5.patchset"
+REVISION="4"
+SOURCE_URI="https://www.x.org/releases/individual/lib/xtrans-$portVersion.tar.bz2"
+CHECKSUM_SHA256="adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301"
+PATCHES="xtrans-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2 x86 x86_64"
-SECONDARY_ARCHITECTURES="x86_gcc2 x86"
+ARCHITECTURES="any"
 
 PROVIDES="
-	xtrans$secondaryArchSuffix = $portVersion
-	devel:xtrans$secondaryArchSuffix = $portVersion
+	xtrans = $portVersion
+	devel:xtrans = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
+	haiku
 	"
 
 BUILD_REQUIRES="
-	haiku${secondaryArchSuffix}_devel
+	haiku_devel
+	devel:util_macros
+	devel:xorg_sgml_doctools
+	docbook_xml_dtd
+	docbook_xsl_stylesheets
 	"
 BUILD_PREREQUIRES="
-	devel:util_macros$secondaryArchSuffix
-	cmd:autoconf
-	cmd:libtool
 	cmd:aclocal
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc
+	cmd:ld
 	cmd:make
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
+	cmd:pkg_config
+	cmd:xmlto
+	cmd:xsltproc
 	"
 
 BUILD()
 {
-	libtoolize --force --copy --install
-	autoreconf -i
+	autoreconf -vfi
 	runConfigure ./configure
+	make $jobArgs
 }
 
 INSTALL()
 {
 	make install
-	mkdir -p $prefix/develop/lib${secondaryArchSuffix/_//}
-	mv -f $prefix/data/pkgconfig $prefix/develop/lib${secondaryArchSuffix/_//}/
 }