diff --git a/x11-clocks/xmms-alarm/Makefile b/x11-clocks/xmms-alarm/Makefile
index 197a686c3e8b..6a179d906a27 100644
--- a/x11-clocks/xmms-alarm/Makefile
+++ b/x11-clocks/xmms-alarm/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmms-alarm
-PORTVERSION=	0.3.3
-PORTREVISION=	1
+PORTVERSION=	0.3.5
 CATEGORIES=	x11-clocks
 MASTER_SITES=	http://www.snika.uklinux.net/xmms-alarm/ \
 		http://unixpages.org/distfiles/
@@ -15,11 +14,16 @@ MASTER_SITES=	http://www.snika.uklinux.net/xmms-alarm/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Alarm timer plugin for the X Multimedia System
 
-BUILD_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
-RUN_DEPENDS=	xmms-config:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 USE_X_PREFIX=	yes
-USE_GNOME=	gtk12
-GNU_CONFIGURE=	yes
+USE_GNOME=	gnometarget gtk12 lthack
+USE_LIBTOOL_VER=	13
+
+PLIST_FILES=	lib/xmms/General/libalarm.so
+
+# This is to avoid libtool running ldconfig -m ${X11BASE}/lib/xmms/General
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/src/.libs/libalarm.so ${PREFIX}/lib/xmms/General
 
 .include <bsd.port.mk>
diff --git a/x11-clocks/xmms-alarm/distinfo b/x11-clocks/xmms-alarm/distinfo
index eff02151553f..f9dc95075c06 100644
--- a/x11-clocks/xmms-alarm/distinfo
+++ b/x11-clocks/xmms-alarm/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmms-alarm-0.3.3.tar.gz) = b781ece1f110c7bb7996e839ea36732e
-SIZE (xmms-alarm-0.3.3.tar.gz) = 243708
+MD5 (xmms-alarm-0.3.5.tar.gz) = f8658be708a19d5fc3c10b5a0859ba7c
+SIZE (xmms-alarm-0.3.5.tar.gz) = 338151
diff --git a/x11-clocks/xmms-alarm/files/patch-ltmain.sh b/x11-clocks/xmms-alarm/files/patch-ltmain.sh
deleted file mode 100644
index 2bd069f202d7..000000000000
--- a/x11-clocks/xmms-alarm/files/patch-ltmain.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-
-$FreeBSD$
-
---- ltmain.sh.orig	Tue Aug 13 01:08:36 2002
-+++ ltmain.sh	Tue Aug 13 01:08:53 2002
-@@ -4247,10 +4247,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-clocks/xmms-alarm/pkg-plist b/x11-clocks/xmms-alarm/pkg-plist
deleted file mode 100644
index 245e537ab749..000000000000
--- a/x11-clocks/xmms-alarm/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-lib/xmms/General/libalarm.so