diff --git a/srcpkgs/Thunar/template b/srcpkgs/Thunar/template
index eb69a4c4d62..de6ca45f058 100644
--- a/srcpkgs/Thunar/template
+++ b/srcpkgs/Thunar/template
@@ -1,6 +1,7 @@
 # Template file for 'Thunar'
 pkgname=Thunar
 version=1.2.0
+revision=1
 distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Thunar File Manager"
diff --git a/srcpkgs/dhcpcd-gtk/template b/srcpkgs/dhcpcd-gtk/template
index 6dbfc17aadb..4541c9d4009 100644
--- a/srcpkgs/dhcpcd-gtk/template
+++ b/srcpkgs/dhcpcd-gtk/template
@@ -1,6 +1,7 @@
 # Template file for 'dhcpcd-gtk'
 pkgname=dhcpcd-gtk
 version=0.4.2
+revision=1
 wrksrc=dhcpcd-ui-${version}
 distfiles="http://roy.marples.name/downloads/dhcpcd/dhcpcd-ui-$version.tar.bz2"
 build_style=gnu_makefile
@@ -20,9 +21,11 @@ long_desc="
  to, if they're encrypted or not and their overall quality. You can click
  on one to configure the PSK or WEP key 0 for it."
 
+Add_dependency run glibc
+Add_dependency run gtk+
+Add_dependency run libnotify
 Add_dependency build pkg-config
-Add_dependency full glibc
+Add_dependency build gtk+-devel
+Add_dependency build libnotify-devel
 Add_dependency full dhcpcd
 Add_dependency full dhcpcd-dbus
-Add_dependency full gtk+
-Add_dependency full libnotify
diff --git a/srcpkgs/midori/template b/srcpkgs/midori/template
index 4b05592a8da..de1bf6d9b5e 100644
--- a/srcpkgs/midori/template
+++ b/srcpkgs/midori/template
@@ -1,6 +1,7 @@
 # Template file for 'midori'
 pkgname=midori
 version=0.3.2
+revision=1
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.3/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-nls --enable-docs --disable-userdocs
@@ -42,6 +43,7 @@ Add_dependency run libxml2
 Add_dependency run dbus-glib
 Add_dependency run dbus-libs
 Add_dependency run libX11
+Add_dependency run libXScrnSaver
 
 Add_dependency build atk-devel
 Add_dependency build glib-devel
@@ -64,6 +66,7 @@ Add_dependency build libunique-devel
 Add_dependency build webkit-gtk-devel
 Add_dependency build sqlite-devel
 Add_dependency build libXext-devel
+Add_dependency build libXScrnSaver-devel
 Add_dependency build vala-devel
 
 Add_dependency full hicolor-icon-theme
diff --git a/srcpkgs/network-manager-applet/patches/libnotify-0.7.patch b/srcpkgs/network-manager-applet/patches/libnotify-0.7.patch
new file mode 100644
index 00000000000..cc0ca10d61f
--- /dev/null
+++ b/srcpkgs/network-manager-applet/patches/libnotify-0.7.patch
@@ -0,0 +1,16 @@
+--- src/applet.c.orig	2011-03-01 00:01:37.106389077 +0100
++++ src/applet.c	2011-03-01 00:01:58.380344793 +0100
+@@ -626,12 +626,10 @@ applet_do_notify (NMApplet *applet,
+ 	escaped = utils_escape_notify_message (message);
+ 	notify = notify_notification_new (summary,
+ 	                                  escaped,
+-	                                  icon ? icon : GTK_STOCK_NETWORK,
+-	                                  NULL);
++	                                  icon ? icon : GTK_STOCK_NETWORK);
+ 	g_free (escaped);
+ 	applet->notification = notify;
+ 
+-	notify_notification_attach_to_status_icon (notify, applet->status_icon);
+ 	notify_notification_set_urgency (notify, urgency);
+ 	notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT);
+ 
diff --git a/srcpkgs/network-manager-applet/template b/srcpkgs/network-manager-applet/template
index 8e9fa9c4686..4ba08854b76 100644
--- a/srcpkgs/network-manager-applet/template
+++ b/srcpkgs/network-manager-applet/template
@@ -1,6 +1,7 @@
 # Template file for 'network-manager-applet'
 pkgname=network-manager-applet
 version=0.8.2
+revision=1
 distfiles="${GNOME_SITE}/$pkgname/0.8/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-schemas-install --localstatedir=/var
diff --git a/srcpkgs/notify-python/template b/srcpkgs/notify-python/template
index d9d1cce8877..35c1bad006f 100644
--- a/srcpkgs/notify-python/template
+++ b/srcpkgs/notify-python/template
@@ -1,7 +1,7 @@
 # Template file for 'notify-python'
 pkgname=notify-python
 version=0.1.1
-revision=2
+revision=3
 distfiles="http://www.galago-project.org/files/releases/source/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu_configure
 short_desc="Python bindings for libnotify"
diff --git a/srcpkgs/orage/template b/srcpkgs/orage/template
index 98d32846cad..83094eb8c8f 100644
--- a/srcpkgs/orage/template
+++ b/srcpkgs/orage/template
@@ -1,6 +1,7 @@
 # Template file for 'orage'
 pkgname=orage
 version=4.8.1
+revision=1
 distfiles="http://archive.be.xfce.org/src/apps/orage/4.8/orage-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Simple calendar application for Xfce"
diff --git a/srcpkgs/thunar-volman/template b/srcpkgs/thunar-volman/template
index c61c91409bc..89bde1a6072 100644
--- a/srcpkgs/thunar-volman/template
+++ b/srcpkgs/thunar-volman/template
@@ -1,6 +1,7 @@
 # Template file for 'thunar-volman'.
 pkgname=thunar-volman
 version=0.6.0
+revision=1
 distfiles="http://archive.xfce.org/src/apps/$pkgname/0.6/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Thunar Volume Manager"
diff --git a/srcpkgs/transmission/template b/srcpkgs/transmission/template
index 1b2b7e44015..94aadf3926e 100644
--- a/srcpkgs/transmission/template
+++ b/srcpkgs/transmission/template
@@ -1,6 +1,7 @@
 # Template file for 'transmission'
 pkgname=transmission
 version=2.21
+revision=1
 distfiles="http://download.transmissionbt.com/files/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--enable-gtk --enable-libnotify --enable-nls --enable-cli
@@ -17,40 +18,30 @@ gtk_iconcache_dirs="/usr/share/icons/hicolor"
 
 Add_dependency run glibc
 Add_dependency run zlib
-Add_dependency run libnotify
-Add_dependency run atk
-Add_dependency run glib
-Add_dependency run pango
-Add_dependency run cairo
-Add_dependency run freetype
-Add_dependency run fontconfig
-Add_dependency run gdk-pixbuf
-Add_dependency run gtk+
-Add_dependency run dbus-libs
-Add_dependency run dbus-glib
 Add_dependency run libssl
+Add_dependency run glib
+Add_dependency run dbus-glib
 Add_dependency run libcurl
 Add_dependency run libevent
+Add_dependency run pango
+Add_dependency run gdk-pixbuf
+Add_dependency run gtk+
+Add_dependency run libnotify
 Add_dependency run libcanberra
 Add_dependency run GConf
 
 Add_dependency build pkg-config
 Add_dependency build intltool
-Add_dependency build libnotify-devel
-Add_dependency build gtk+-devel
-Add_dependency build atk-devel
-Add_dependency build glib-devel
-Add_dependency build pango-devel
-Add_dependency build cairo-devel
-Add_dependency build freetype-devel
-Add_dependency build fontconfig-devel
-Add_dependency build glibc-devel
-Add_dependency build dbus-devel
-Add_dependency build dbus-glib-devel
-Add_dependency build openssl-devel
-Add_dependency build libcurl-devel
 Add_dependency build zlib-devel
+Add_dependency build openssl-devel
+Add_dependency build glib-devel
+Add_dependency build dbus-glib-devel
+Add_dependency build libcurl-devel
 Add_dependency build libevent-devel
+Add_dependency build pango-devel
+Add_dependency build gdk-pixbuf-devel
+Add_dependency build gtk+-devel
+Add_dependency build libnotify-devel
 Add_dependency build libcanberra-devel
 Add_dependency build GConf-devel
 
diff --git a/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch b/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch
new file mode 100644
index 00000000000..93b62d85131
--- /dev/null
+++ b/srcpkgs/vlc/patches/vlc-1.1.7-libnotify-0.7.patch
@@ -0,0 +1,11 @@
+--- modules/misc/notify/notify.c.orig	2011-02-28 23:54:18.794722978 +0100
++++ modules/misc/notify/notify.c	2011-02-28 23:54:49.425738093 +0100
+@@ -312,7 +312,7 @@ static int Notify( vlc_object_t *p_this,
+     }
+ 
+     notification = notify_notification_new( _("Now Playing"),
+-                                            psz_temp, NULL, NULL );
++                                            psz_temp, NULL );
+     notify_notification_set_timeout( notification,
+                                 var_InheritInteger(p_this, "notify-timeout") );
+     notify_notification_set_urgency( notification, NOTIFY_URGENCY_LOW );
diff --git a/srcpkgs/vlc/template b/srcpkgs/vlc/template
index 462848cfc94..59ae7ecc8eb 100644
--- a/srcpkgs/vlc/template
+++ b/srcpkgs/vlc/template
@@ -1,7 +1,7 @@
 # Template file for 'vlc'
 pkgname=vlc
 version=1.1.7
-revision=1
+revision=2
 distfiles="http://download.videolan.org/pub/videolan/vlc/$version/vlc-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--disable-gme --disable-libtar --enable-snapshot
diff --git a/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch b/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch
new file mode 100644
index 00000000000..460510df42a
--- /dev/null
+++ b/srcpkgs/xfce4-power-manager/patches/libnotify-0.7.patch
@@ -0,0 +1,18 @@
+--- src/xfpm-notify.c.orig	2011-02-28 23:43:55.521921469 +0100
++++ src/xfpm-notify.c	2011-02-28 23:44:16.343032607 +0100
+@@ -209,14 +209,11 @@ xfpm_notify_new_notification_internal (c
+ {
+     NotifyNotification *n;
+     
+-    n = notify_notification_new (title, message, NULL, NULL);
++    n = notify_notification_new (title, message, NULL);
+     
+     if ( icon_name )
+     	xfpm_notify_set_notification_icon (n, icon_name);
+ 	
+-    if ( icon )
+-    	notify_notification_attach_to_status_icon (n, icon);
+-	
+     notify_notification_set_urgency (n, (NotifyUrgency)urgency);
+     
+     if ( timeout != 0)
diff --git a/srcpkgs/xfce4-power-manager/template b/srcpkgs/xfce4-power-manager/template
index a27d4f7fb86..72e6bb0b1e4 100644
--- a/srcpkgs/xfce4-power-manager/template
+++ b/srcpkgs/xfce4-power-manager/template
@@ -1,6 +1,7 @@
 # Template file for 'xfce4-power-manager'
 pkgname=xfce4-power-manager
 version=1.0.3
+revision=1
 distfiles="http://archive.xfce.org/src/apps/${pkgname}/1.0/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --enable-polkit --enable-dpms
diff --git a/srcpkgs/xfce4-settings/template b/srcpkgs/xfce4-settings/template
index 94f51787b07..65aefac96dc 100644
--- a/srcpkgs/xfce4-settings/template
+++ b/srcpkgs/xfce4-settings/template
@@ -1,6 +1,7 @@
 # Template file for 'xfce4-settings'
 pkgname=xfce4-settings
 version=4.8.0
+revision=1
 distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 configure_args="--localstatedir=/var --enable-sound-settings
diff --git a/srcpkgs/xfdesktop/template b/srcpkgs/xfdesktop/template
index cf0b6e8f56a..2ca128d9ba1 100644
--- a/srcpkgs/xfdesktop/template
+++ b/srcpkgs/xfdesktop/template
@@ -1,6 +1,7 @@
 # Template file for 'xfdesktop'
 pkgname=xfdesktop
 version=4.8.0
+revision=1
 distfiles="http://archive.xfce.org/xfce/4.8/src/$pkgname-$version.tar.bz2"
 build_style=gnu_configure
 short_desc="Desktop manager for the XFce Desktop Environment"
diff --git a/xbps-src/common/mapping_shlib_binpkg.txt b/xbps-src/common/mapping_shlib_binpkg.txt
index c0d3b254208..9f1b7f6a4cd 100644
--- a/xbps-src/common/mapping_shlib_binpkg.txt
+++ b/xbps-src/common/mapping_shlib_binpkg.txt
@@ -772,3 +772,4 @@ libspice-server.so		spice			spice-devel
 libbrasero-burn.so		brasero			brasero-devel
 libbrasero-media.so		brasero			brasero-devel
 libbrasero-utils.so		brasero			brasero-devel
+libXss.so			libXScrnSaver		libXScrnSaver-devel