diff --git a/srcpkgs/lesstif/template b/srcpkgs/lesstif/template
index 5dff110e2de..f9e061b6bb4 100644
--- a/srcpkgs/lesstif/template
+++ b/srcpkgs/lesstif/template
@@ -1,16 +1,17 @@
 # Template build file for 'lesstif'
 pkgname=lesstif
 version=0.95.2
-revision=4
+revision=5
 build_style=gnu-configure
 short_desc="LGPL'd re-implementation of Motif"
 maintainer="Enno Boland <gottox@voidlinux.eu>"
-license="LGPL"
+license="LGPL-2.1"
 homepage="http://lesstif.sourceforge.net/"
-distfiles="http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${version}.tar.bz2"
+distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2"
 checksum=eb4aa38858c29a4a3bcf605cfe7d91ca41f4522d78d770f69721e6e3a4ecf7e3
 hostmakedepends="pkg-config"
-makedepends="libXt-devel libXp-devel libXft-devel libXrender-devel fontconfig-devel freetype-devel libX11-devel libICE-devel"
+#makedepends="libXt-devel libXp-devel libXft-devel libXrender-devel fontconfig-devel freetype-devel libX11-devel libICE-devel"
+makedepends="libXt-devel libXp-devel libXft-devel"
 configure_args="--prefix=/usr \
 	--mandir=/usr/share/man \
 	--docdir=/usr/share/doc \
@@ -24,6 +25,15 @@ configure_args="--prefix=/usr \
 	--x-includes=/usr/include \
 	--x-libraries=/usr/lib"
 
+pre_build() {
+	if [ -n "$CROSS_BUILD" ]; then
+		cd ${wrksrc}/scripts
+		msg_normal "Building man2html for $XBPS_ARCH\n"
+		cc -o man2html man2html.c
+		# Disable the rule for cross-gcc man2html
+		sed -i Makefile -e "/noinst_PROGRAMS = / s/man2html.*//"
+	fi
+}
 post_install() {
 	rm -rf $DESTDIR/usr/LessTif
 }
@@ -40,7 +50,7 @@ lesstif-mwm_package() {
 }
 
 lesstif-xmbind_package() {
-	short_desc="configures the virtual key bindings of LessTif applications"
+	short_desc="Configures the virtual key bindings of LessTif applications"
 	pkg_install() {
 		vmove usr/bin/xmbind
 		vmove usr/share/man/man1/xmbind.1
@@ -48,7 +58,7 @@ lesstif-xmbind_package() {
 }
 
 lesstif-devel_package() {
-	depends="lesstif>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include