diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index ea9e4ebee16..353bef0b4e0 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,29 +1,29 @@
-# $OpenBSD: Makefile,v 1.21 2008/06/29 20:31:14 sthen Exp $
+# $OpenBSD: Makefile,v 1.22 2008/12/02 09:11:15 ajacoutot Exp $
 
 COMMENT=		mail notification for freedesktop.org-compliant system trays
-DISTNAME=		mail-notification-4.0
-PKGNAME=		${DISTNAME}p5
+DISTNAME=		mail-notification-5.4
 CATEGORIES=		mail
 
+EXTRACT_SUFX=		.tar.bz2
+
 HOMEPAGE=		http://www.nongnu.org/mailnotify/
 
-# GPL
+# GPLv3
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcursor Xdmcp \
-		Xcomposite Xdamage pcre \
-		Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2 atk-1.0 \
-		audiofile bonobo-2 bonobo-activation bonoboui-2 c cairo \
-		crypto dbus-1 dbus-glib-1 esd expat fam fontconfig \
-		freetype gailutil gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 \
-		glade-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 gnome-desktop-2 \
-		gnome-keyring gnome-menu gnomecanvas-2 gnomeui-2 gnomevfs-2 \
-		gobject-2.0 gthread-2.0 gtk-x11-2.0 jpeg m pango-1.0 \
-		pangocairo-1.0 pangoft2-1.0 pixman-1 png popt pthread \
-		rpcsvc ssl startup-notification-1 stdc++ util xml2 z
+WANTLIB=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \
+		Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
+		art_lgpl_2 atk-1.0 audiofile bonobo-2 \
+		bonobo-activation bonoboui-2 c cairo crypto dbus-1 \
+		dbus-glib-1 esd expat fontconfig freetype gailutil \
+		gconf-2 gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glade-2.0 \
+		glib-2.0 glitz gmodule-2.0 gnome-2 gnome-keyring \
+		gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 \
+		gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
+		pixman-1 png popt pthread ssl xml2 z
 
 MASTER_SITES=	http://savannah.nongnu.org/download/mailnotify/
 
@@ -32,32 +32,44 @@ MODULES=	devel/gettext \
 
 BUILD_DEPENDS=	:scrollkeeper-*:textproc/scrollkeeper
 RUN_DEPENDS=	:scrollkeeper-*:textproc/scrollkeeper \
-		:gnome-icon-theme-*:x11/gnome/icon-theme \
 		:desktop-file-utils-*:devel/desktop-file-utils \
-		:yelp-*:x11/gnome/yelp
-LIB_DEPENDS=	notify::devel/libnotify \
-		eel-2::x11/gnome/eel \
+		:yelp-*:x11/gnome/yelp \
+		:notification-daemon-*|notification-daemon-xfce-*:sysutils/notification-daemon
+LIB_DEPENDS=	gnomeui-2.>=2400::x11/gnome/libgnomeui \
+		notify::devel/libnotify \
 		sasl2::security/cyrus-sasl2 \
 		gmime-2.0::mail/gmime
 
 USE_X11=		Yes
-USE_GMAKE=		Yes
+NO_REGRESS=		Yes
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/mail-notification \
-			--disable-schemas-install \
-			--disable-evolution
+do-configure:
+	cd ${WRKSRC} && ./jb configure ${JB_FLAGS} \
+		evolution=no hotmail=no yahoo=no \
+		cc="${CC}" \
+		cflags="${CFLAGS}" \
+		cppflags="-I${LOCALBASE}/include" \
+		ldflags="-L${LOCALBASE}/lib -liconv" \
+		prefix="${PREFIX}" \
+		data-owner=${SHAREOWN} \
+		data-group=${SHAREGRP} \
+		program-owner=${BINOWN} \
+		program-group=${BINGRP} \
+		library-owner=${BINOWN} \
+		library-group=${BINGRP} \
+		gconf-schemas-dir="${LOCALBASE}/share/schemas/mail-notification" \
+		scrollkeeper-update="/usr/bin/true" \
+		gconftool-2="/usr/bin/true" \
+		destdir="${WRKINST}"
 
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib"
+do-build:
+	cd ${WRKBUILD} && ./jb build
 
-post-patch:
-	@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
+do-install:
+	cd ${WRKBUILD} && ./jb ${INSTALL_TARGET}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mail-notification
-	mv ${WRKINST}${SYSCONFDIR}/* ${PREFIX}/share/examples/mail-notification
+	mv ${PREFIX}${SYSCONFDIR}/xdg ${PREFIX}/share/examples/mail-notification
 
 .include <bsd.port.mk>
-
-CONFIGURE_ARGS+=	--sysconfdir="${SYSCONFDIR}/gnome"
diff --git a/mail/mail-notification/distinfo b/mail/mail-notification/distinfo
index 1eb042e922c..8293cc06386 100644
--- a/mail/mail-notification/distinfo
+++ b/mail/mail-notification/distinfo
@@ -1,5 +1,5 @@
-MD5 (mail-notification-4.0.tar.gz) = DhCyId5DifqSdft79S3AEA==
-RMD160 (mail-notification-4.0.tar.gz) = Z4BIFPgqgEjFiH3PTjwtgneQ3IA=
-SHA1 (mail-notification-4.0.tar.gz) = nMgy/3WROoAZjls9alHCguQiog8=
-SHA256 (mail-notification-4.0.tar.gz) = 6PRiQg0TmNKT7juUUehUxMqb8DARHDjj5CR88oE9s3g=
-SIZE (mail-notification-4.0.tar.gz) = 956007
+MD5 (mail-notification-5.4.tar.bz2) = yNwzphJRrLVHTlbqtrGPQw==
+RMD160 (mail-notification-5.4.tar.bz2) = ZJRlCe+Z/euo/1R/+sODDDYTFIQ=
+SHA1 (mail-notification-5.4.tar.bz2) = wUhEnF0v0KdVceTkKTLaHxrgE/Y=
+SHA256 (mail-notification-5.4.tar.bz2) = XexfOFJDfnc1JpaXx3opok6iMJh8dkUj/mbavcqBWvU=
+SIZE (mail-notification-5.4.tar.bz2) = 570008
diff --git a/mail/mail-notification/patches/patch-jb b/mail/mail-notification/patches/patch-jb
new file mode 100644
index 00000000000..ae283ca0185
--- /dev/null
+++ b/mail/mail-notification/patches/patch-jb
@@ -0,0 +1,19 @@
+$OpenBSD: patch-jb,v 1.1 2008/12/02 09:11:15 ajacoutot Exp $
+--- jb.orig	Sun Nov 30 19:18:47 2008
++++ jb	Sun Nov 30 19:19:05 2008
+@@ -23,7 +23,6 @@ maintainer_cflags="-g -fstrict-aliasing -Wall -Werror 
+ -Wno-format-zero-length \
+ -Wno-unused-parameter \
+ -Wfloat-equal \
+--Wdeclaration-after-statement \
+ -Wendif-labels \
+ -Wpointer-arith \
+ -Wcast-align \
+@@ -34,7 +33,6 @@ maintainer_cflags="-g -fstrict-aliasing -Wall -Werror 
+ -Wredundant-decls \
+ -Wnested-externs \
+ -Winline \
+--Wno-pointer-sign \
+ -Wshadow"
+ 
+ if test -z $jb_cc; then
diff --git a/mail/mail-notification/patches/patch-jbsrc_jb_c b/mail/mail-notification/patches/patch-jbsrc_jb_c
new file mode 100644
index 00000000000..eb6dc6965d0
--- /dev/null
+++ b/mail/mail-notification/patches/patch-jbsrc_jb_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-jbsrc_jb_c,v 1.1 2008/12/02 09:11:15 ajacoutot Exp $
+--- jbsrc/jb.c.orig	Sun Nov 30 21:49:07 2008
++++ jbsrc/jb.c	Sun Nov 30 21:49:30 2008
+@@ -365,8 +365,6 @@ jb_package_add_resources (void)
+     jb_group_add_data_file(group, "hotmail.png", "$pkgdatadir");
+ 
+   rule = jb_rule_new();
+-  jb_rule_set_install_message(rule, "updating the GTK+ icon cache");
+-  jb_rule_add_install_command(rule, "-gtk-update-icon-cache -f -t $datadir/icons/hicolor");
+   jb_group_add_resource(group, JB_GROUP_RESOURCE(rule));
+ 
+   jb_group_add(group);
diff --git a/mail/mail-notification/pkg/PLIST b/mail/mail-notification/pkg/PLIST
index f64b5f40249..5fe1b549ae0 100644
--- a/mail/mail-notification/pkg/PLIST
+++ b/mail/mail-notification/pkg/PLIST
@@ -1,28 +1,21 @@
-@comment $OpenBSD: PLIST,v 1.6 2008/04/17 08:10:10 ajacoutot Exp $
-bin/mail-notification
-lib/bonobo/
-lib/bonobo/servers/
-lib/bonobo/servers/GNOME_MailNotification.server
-share/applications/
+@comment $OpenBSD: PLIST,v 1.7 2008/12/02 09:11:15 ajacoutot Exp $
+@bin bin/mail-notification
+etc/
 share/applications/mail-notification-properties.desktop
 share/examples/mail-notification/
-share/examples/mail-notification/gnome/
-share/examples/mail-notification/gnome/xdg/
-share/examples/mail-notification/gnome/xdg/autostart/
-share/examples/mail-notification/gnome/xdg/autostart/mail-notification.desktop
-share/gnome/
-share/gnome/help/
+share/examples/mail-notification/xdg/
+@sample ${SYSCONFDIR}/xdg/
+share/examples/mail-notification/xdg/autostart/
+@sample ${SYSCONFDIR}/xdg/autostart/
+share/examples/mail-notification/xdg/autostart/mail-notification.desktop
+@sample ${SYSCONFDIR}/xdg/autostart/mail-notification.desktop
 share/gnome/help/mail-notification/
 share/gnome/help/mail-notification/C/
 share/gnome/help/mail-notification/C/documentation-license.xml
 share/gnome/help/mail-notification/C/figures/
 share/gnome/help/mail-notification/C/figures/mail.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-error.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-polled.png
-share/gnome/help/mail-notification/C/figures/mailbox-emblem-unknown.png
 share/gnome/help/mail-notification/C/mail-notification.xml
 share/gnome/help/mail-notification/C/software-license.xml
-share/icons/hicolor/
 share/icons/hicolor/16x16/
 share/icons/hicolor/16x16/apps/
 share/icons/hicolor/16x16/apps/mail-notification.png
@@ -45,6 +38,7 @@ share/locale/bg/LC_MESSAGES/mail-notification.mo
 share/locale/ca/LC_MESSAGES/mail-notification.mo
 share/locale/cs/LC_MESSAGES/mail-notification.mo
 share/locale/de/LC_MESSAGES/mail-notification.mo
+share/locale/es/LC_MESSAGES/mail-notification.mo
 share/locale/fr/LC_MESSAGES/mail-notification.mo
 share/locale/ja/LC_MESSAGES/mail-notification.mo
 share/locale/nl/LC_MESSAGES/mail-notification.mo
@@ -56,15 +50,14 @@ share/locale/sr/LC_MESSAGES/mail-notification.mo
 share/locale/sr@Latn/LC_MESSAGES/mail-notification.mo
 share/locale/sv/LC_MESSAGES/mail-notification.mo
 share/mail-notification/
-share/mail-notification/ui/
-share/mail-notification/ui/gmail.png
-share/mail-notification/ui/logo.png
-share/mail-notification/ui/mailbox-properties-dialog.glade
-share/mail-notification/ui/properties-dialog.glade
+share/mail-notification/gmail.png
+share/mail-notification/logo.png
+share/mail-notification/mailbox-properties-dialog.glade
+share/mail-notification/new-mail.wav
+share/mail-notification/properties-dialog.glade
 share/omf/mail-notification/
 share/omf/mail-notification/mail-notification-C.omf
 @unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/mail-notification/*.schemas > /dev/null
-share/schemas/
 share/schemas/mail-notification/
 share/schemas/mail-notification/mail-notification.schemas
 @exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/mail-notification/*.schemas > /dev/null