diff --git a/x11-toolkits/lesstif/Makefile b/x11-toolkits/lesstif/Makefile
index e356bce50413..625b20bef0cd 100644
--- a/x11-toolkits/lesstif/Makefile
+++ b/x11-toolkits/lesstif/Makefile
@@ -6,13 +6,10 @@
 #
 
 PORTNAME=	lesstif
-PORTVERSION=	0.93.36
-PORTREVISION=	1
+PORTVERSION=	0.93.94
 CATEGORIES=	x11-toolkits
-MASTER_SITES=	http://twtelecom.dl.sourceforge.net/sourceforge/lesstif/ \
-		http://umn.dl.sourceforge.net/sourceforge/lesstif/ \
-		http://umn.dl.sourceforge.net/sourceforge/lesstif/ \
-		http://gd.tuwien.ac.at/hci/lesstif/srcdist/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	lesstif
 
 MAINTAINER=	dinoex@freebsd.org
 COMMENT=	API compatible clone of the Motif toolkit
@@ -54,7 +51,7 @@ MAN3 =	ApplicationShell.3 Composite.3 Constraint.3 Core.3 \
 
 MAN5 =	VirtualBindings.5 mwmrc.5
 
-.if defined(HAVE_MOTIF) && !defined(PARALLEL_PACKAGE_BUILD)
+.if defined(HAVE_MOTIF) && !defined(PARALLEL_PACKAGE_BUILD) && !defined(WANT_LESSTIF)
 IS_INTERACTIVE=	yes
 pre-extract:
 	@${ECHO_CMD} "***********************************************************"
@@ -75,12 +72,6 @@ pre-extract:
 	esac)
 .endif
 
-pre-install:
-	if [ -f ${X11BASE}/lib/X11/config/host.def ]; then \
-		mv -f ${X11BASE}/lib/X11/config/host.def \
-			${X11BASE}/lib/X11/config/host.def.pre-lesstif; \
-	fi
-
 post-install:
 	${RM} -f ${PREFIX}/lib/libXm.la
 	${RM} -f ${PREFIX}/lib/libMrm.la
diff --git a/x11-toolkits/lesstif/distinfo b/x11-toolkits/lesstif/distinfo
index 48dc515e23f6..d165fe1be9e1 100644
--- a/x11-toolkits/lesstif/distinfo
+++ b/x11-toolkits/lesstif/distinfo
@@ -1 +1 @@
-MD5 (lesstif-0.93.36.tar.gz) = e2c974a40a07066c128d44c3adcb2e4e
+MD5 (lesstif-0.93.94.tar.gz) = 9eb87b5470333ccb31425a47d24f5a96
diff --git a/x11-toolkits/lesstif/files/patch-ab b/x11-toolkits/lesstif/files/patch-ab
deleted file mode 100644
index 82ec9549a718..000000000000
--- a/x11-toolkits/lesstif/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/lessdox/clients/Makefile.in.orig	Tue Aug  6 11:52:13 2002
-+++ doc/lessdox/clients/Makefile.in	Wed Dec  4 08:08:03 2002
-@@ -69,7 +69,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- 
--mandir = $(exec_prefix)/LessTif/doc/man
-+mandir = @mandir@
- ACLOCALDIR = @ACLOCALDIR@
- AMTAR = @AMTAR@
- AR = @AR@
diff --git a/x11-toolkits/lesstif/files/patch-ac b/x11-toolkits/lesstif/files/patch-ac
deleted file mode 100644
index a94e26d8e921..000000000000
--- a/x11-toolkits/lesstif/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/lessdox/widgets/Makefile.in.orig	Tue Aug  6 11:52:14 2002
-+++ doc/lessdox/widgets/Makefile.in	Wed Dec  4 08:09:35 2002
-@@ -69,7 +69,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- 
--mandir = $(exec_prefix)/LessTif/doc/man
-+mandir = @mandir@
- ACLOCALDIR = @ACLOCALDIR@
- AMTAR = @AMTAR@
- AR = @AR@
diff --git a/x11-toolkits/lesstif/files/patch-ad b/x11-toolkits/lesstif/files/patch-ad
deleted file mode 100644
index f4e5def597b4..000000000000
--- a/x11-toolkits/lesstif/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/lessdox/functions/Makefile.in.orig	Tue Aug  6 11:52:13 2002
-+++ doc/lessdox/functions/Makefile.in	Wed Dec  4 08:11:04 2002
-@@ -69,7 +69,7 @@
- OBJEXT = @OBJEXT@
- PATH_SEPARATOR = @PATH_SEPARATOR@
- 
--mandir = $(exec_prefix)/LessTif/doc/man
-+mandir = @mandir@
- ACLOCALDIR = @ACLOCALDIR@
- AMTAR = @AMTAR@
- AR = @AR@
diff --git a/x11-toolkits/lesstif/pkg-plist b/x11-toolkits/lesstif/pkg-plist
index c78eafd05d5a..30df214ef2a6 100644
--- a/x11-toolkits/lesstif/pkg-plist
+++ b/x11-toolkits/lesstif/pkg-plist
@@ -322,12 +322,10 @@ include/uil/UilDef.h
 include/uil/UilSymDef.h
 include/uil/UilSymGl.h
 include/uil/XmAppl.uil
-@exec [ -f %D/lib/X11/config/host.def ] && mv -f %D/lib/X11/config/host.def %D/lib/X11/config/host.def.pre-lesstif
+lib/LessTif/config/LessTif.rules
+lib/LessTif/config/LessTif.tmpl
+lib/LessTif/config/host.def
 lib/X11/app-defaults/Mwm
-lib/X11/config/LessTif.rules
-lib/X11/config/LessTif.tmpl
-lib/X11/config/host.def
-@unexec [ -f %D/lib/X11/config/host.def.pre-lesstif ] && mv -f %D/lib/X11/config/host.def.pre-lesstif %D/lib/X11/config/host.def
 lib/X11/mwm/README
 lib/X11/mwm/alt.map
 lib/X11/mwm/system.mwmrc
@@ -355,6 +353,8 @@ lib/libXm.so.2
 @dirrm include/Mrm
 @dirrm include/Xm
 @dirrm include/uil
+@dirrm lib/LessTif/config
+@dirrm lib/LessTif
 @dirrm lib/X11/mwm
 @cwd %%LOCALBASE%%
 share/aclocal/ac_find_motif.m4