diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile
index 8836032c0b9..95f4c6315de 100644
--- a/x11/gnome/applets2/Makefile
+++ b/x11/gnome/applets2/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.20 2005/05/26 03:39:30 marcm Exp $
+# $OpenBSD: Makefile,v 1.21 2005/07/11 04:28:58 marcm Exp $
 
 COMMENT=		"applets for use with the GNOME panel"
 COMMENT-battstat=	"GNOME applet for monitoring battery level"
 
 VERSION=		2.10.1
-SUBVERS=		
+SUBVERS=		p0
 DISTNAME=		gnome-applets-${VERSION}
 PKGNAME=		gnome-applets2-${VERSION}${SUBVERS}
 PKGNAME-battstat=	gnome-applets2-battstat-${VERSION}${SUBVERS}
@@ -35,7 +35,8 @@ MODULES=		devel/gettext
 BUILD_DEPENDS= 		:pkgconfig-*:devel/pkgconfig \
 			:scrollkeeper-*:textproc/scrollkeeper \
 			:p5-XML-Parser-*:textproc/p5-XML-Parser
-RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper
+RUN_DEPENDS=		:scrollkeeper-*:textproc/scrollkeeper \
+			:hicolor-icon-theme-*:x11/hicolor-icon-theme
 LIB_DEPENDS=		panel-applet-2.0::x11/gnome/panel \
 			gailutil.17::x11/gnome/gail \
 			gstinterfaces-0.8.1.0::devel/gstreamer-plugins,minimal \
@@ -80,8 +81,10 @@ WANTLIB+=		Xext XRes kvm xkbfile gstreamer-0.8.5.0 startup-notification-1 wnck-1
 post-patch:
 	@ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update
 
+.if !${FLAVOR:L:Mno_battstat}
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-applets2; \
 	cp -Rp ${WRKINST}/${SYSCONFDIR}/gnome/* ${PREFIX}/share/examples/gnome-applets2/
+.endif
 
 .include <bsd.port.mk>
diff --git a/x11/gnome/applets2/patches/patch-stickynotes_docs_C_stickynotes_applet_xml b/x11/gnome/applets2/patches/patch-stickynotes_docs_C_stickynotes_applet_xml
new file mode 100644
index 00000000000..aab22c32e37
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-stickynotes_docs_C_stickynotes_applet_xml
@@ -0,0 +1,12 @@
+$OpenBSD: patch-stickynotes_docs_C_stickynotes_applet_xml,v 1.1 2005/07/11 04:28:58 marcm Exp $
+--- stickynotes/docs/C/stickynotes_applet.xml.orig	Mon Jul 11 03:18:08 2005
++++ stickynotes/docs/C/stickynotes_applet.xml	Mon Jul 11 03:18:25 2005
+@@ -225,7 +225,7 @@ Template last modified Mar 12, 2002
+ 
+   <sect2 id="stickynotes-lock-notes">
+     <title>Locking and Unlocking Sticky Notes</title>
+-  <figure id="stickynotes-using-left-fig">
++  <figure id="stickynotes-using-right-fig">
+     <title>Right Clicking on the Icon</title>
+     <screenshot>
+       <mediaobject>
diff --git a/x11/gnome/applets2/patches/patch-stickynotes_docs_uk_stickynotes_applet_xml b/x11/gnome/applets2/patches/patch-stickynotes_docs_uk_stickynotes_applet_xml
new file mode 100644
index 00000000000..fe860f687b4
--- /dev/null
+++ b/x11/gnome/applets2/patches/patch-stickynotes_docs_uk_stickynotes_applet_xml
@@ -0,0 +1,12 @@
+$OpenBSD: patch-stickynotes_docs_uk_stickynotes_applet_xml,v 1.1 2005/07/11 04:28:58 marcm Exp $
+--- stickynotes/docs/uk/stickynotes_applet.xml.orig	Mon Jul 11 04:16:49 2005
++++ stickynotes/docs/uk/stickynotes_applet.xml	Mon Jul 11 04:17:04 2005
+@@ -201,7 +201,7 @@ Template last modified Mar 12, 2002
+ 
+   <sect2 id="stickynotes-lock-notes">
+     <title>Блокування та розблокування нотаток</title>
+-  <figure id="stickynotes-using-left-fig">
++  <figure id="stickynotes-using-right-fig">
+     <title>Клацання правою кнопкою миші на аплеті</title>
+     <screenshot>
+       <mediaobject>
diff --git a/x11/gnome/applets2/pkg/PLIST b/x11/gnome/applets2/pkg/PLIST
index c06d4c7ec45..18fea8314c6 100644
--- a/x11/gnome/applets2/pkg/PLIST
+++ b/x11/gnome/applets2/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.16 2005/05/26 03:39:30 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.17 2005/07/11 04:28:58 marcm Exp $
 bin/gswitchit-plugins-capplet
 include/libgswitchit/
 include/libgswitchit/gswitchit_config.h
@@ -884,10 +884,6 @@ share/gnome/help/trashapplet/uk/figures/
 share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/legal.xml
 share/gnome/help/trashapplet/uk/trashapplet.xml
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
 share/icons/hicolor/48x48/apps/ax-applet.png
 share/icons/hicolor/48x48/apps/charpick.png
 share/icons/hicolor/48x48/apps/gnome-cpu.png