diff --git a/x11/xfce4/Makefile.inc b/x11/xfce4/Makefile.inc
index 18df97d7429..b913e75ca24 100644
--- a/x11/xfce4/Makefile.inc
+++ b/x11/xfce4/Makefile.inc
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile.inc,v 1.2 2005/11/10 22:57:37 jolan Exp $
+# $OpenBSD: Makefile.inc,v 1.3 2005/11/11 04:30:05 jolan Exp $
 
 CATEGORIES=	x11
 DIST_SUBDIR=	xfce4
 
-USE_LIBTOOL=	Yes
+USE_LIBTOOL?=	Yes
 USE_X11=	Yes
 
 CONFIGURE_STYLE=gnu
diff --git a/x11/xfce4/xfce4-clipman/Makefile b/x11/xfce4/xfce4-clipman/Makefile
index 67f5b6dfb95..58bbd6a8c96 100644
--- a/x11/xfce4/xfce4-clipman/Makefile
+++ b/x11/xfce4/xfce4-clipman/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:39 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/11 04:30:05 jolan Exp $
 
 COMMENT=	"clipboard history plugin for the xfce4 panel"
 DISTNAME=	xfce4-clipman-plugin-0.4.1
@@ -24,10 +24,4 @@ WANTLIB=	X11 Xcursor Xext Xft Xinerama Xrender fontconfig freetype m z \
 		gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 pango-1.0.0.0 \
 		pangox-1.0.0.0 pangoxft-1.0.0.0 xfce4util.1
 
-
-# XXX workaround libtool's versioning of simple shared object modules
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/panel-plugin/.libs/libclipman.so.0.0 \
-		${PREFIX}/lib/xfce4/panel-plugins/libclipman.so
-
 .include <bsd.port.mk>
diff --git a/x11/xfce4/xfce4-icon-theme/Makefile b/x11/xfce4/xfce4-icon-theme/Makefile
index db18b578c23..c51dfe4b062 100644
--- a/x11/xfce4/xfce4-icon-theme/Makefile
+++ b/x11/xfce4/xfce4-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:39 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/11 04:30:05 jolan Exp $
 PKG_ARCH=	*
 
 COMMENT=	"icon theme for xfce4"
@@ -14,6 +14,8 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
+USE_LIBTOOL=	No
+
 RUN_DEPENDS=	:xfce4-panel-*:x11/xfce4/xfce4-panel
 
 .include <bsd.port.mk>
diff --git a/x11/xfce4/xfwm4-themes/Makefile b/x11/xfce4/xfwm4-themes/Makefile
index 23c124eab29..8cc2c37002d 100644
--- a/x11/xfce4/xfwm4-themes/Makefile
+++ b/x11/xfce4/xfwm4-themes/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:41 jolan Exp $
+# $OpenBSD: Makefile,v 1.4 2005/11/11 04:30:05 jolan Exp $
 PKG_ARCH=	*
 
 COMMENT=	"window decoration themes for xfwm4"
@@ -14,6 +14,8 @@ PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 
+USE_LIBTOOL=	No
+
 RUN_DEPENDS=	:xfwm4-*:x11/xfce4/xfwm4
 
 .include <bsd.port.mk>