diff --git a/x11/kde/pim3/Makefile b/x11/kde/pim3/Makefile
index e053c1e53c3..d401dccdd39 100644
--- a/x11/kde/pim3/Makefile
+++ b/x11/kde/pim3/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.43 2007/01/28 13:18:51 espie Exp $
+# $OpenBSD: Makefile,v 1.44 2007/02/01 07:25:35 espie Exp $
 
 COMMENT= 		"KDE personal information applications"
 COMMENT-kpilot=		"KDE interface to sync with Palm Pilot"
 CATEGORIES=		x11 x11/kde productivity
 VERSION=		3.5.6
 DISTNAME=		kdepim-${VERSION}
-PKGNAME=		${DISTNAME}
+PKGNAME=		${DISTNAME}p0
 MODKDE_VERSION=		3.5.3
 SHARED_LIBS +=	index                1.0      # .0.0
 SHARED_LIBS +=	kgantt               1.0      # .0.2
@@ -94,5 +94,5 @@ FULLPKGNAME-kpilot = kpilot-${VERSION}p0
 USE_X11=	Yes
 USE_LIBTOOL=Yes
 LIBTOOL_FLAGS+=--tag disable-static
-#SEPARATE_BUILD=	flavored
+SEPARATE_BUILD=	flavored
 .include <bsd.port.mk>
diff --git a/x11/kde/pim3/patches/patch-kmail_kmfolder_cpp b/x11/kde/pim3/patches/patch-kmail_kmfolder_cpp
new file mode 100644
index 00000000000..d47e0d20650
--- /dev/null
+++ b/x11/kde/pim3/patches/patch-kmail_kmfolder_cpp
@@ -0,0 +1,21 @@
+$OpenBSD: patch-kmail_kmfolder_cpp,v 1.1 2007/02/01 07:25:35 espie Exp $
+--- kmail/kmfolder.cpp.orig	Thu Feb  1 01:15:12 2007
++++ kmail/kmfolder.cpp	Thu Feb  1 01:15:19 2007
+@@ -631,11 +631,13 @@ void KMFolder::setUserWhoField( const QS
+         mWhoField = "From";
+       if ( this == kmkernel->outboxFolder() ||
+            this == kmkernel->sentFolder() ||
+-           this == kmkernel->draftsFolder() )
++           this == kmkernel->draftsFolder() ||
++           this == kmkernel->templatesFolder() )
+         mWhoField = "To";
+-    } else if ( identity.drafts() == idString()
+-                || identity.fcc() == idString() )
+-      // drafts or sent of the identity
++    } else if ( identity.drafts() == idString() ||
++                identity.templates() == idString() ||
++                identity.fcc() == idString() )
++      // drafts, templates or sent of the identity
+       mWhoField = "To";
+     else
+       mWhoField = "From";
diff --git a/x11/kde/pim3/patches/patch-kpilot_conduits_Makefile_in b/x11/kde/pim3/patches/patch-kpilot_conduits_Makefile_in
index 18aa362ad84..a1b9c38bf9e 100644
--- a/x11/kde/pim3/patches/patch-kpilot_conduits_Makefile_in
+++ b/x11/kde/pim3/patches/patch-kpilot_conduits_Makefile_in
@@ -1,11 +1,21 @@
-$OpenBSD: patch-kpilot_conduits_Makefile_in,v 1.1 2007/01/31 18:39:28 ajacoutot Exp $
---- kpilot/conduits/Makefile.in.orig	Wed Jan 31 19:33:12 2007
-+++ kpilot/conduits/Makefile.in	Wed Jan 31 19:33:36 2007
-@@ -471,6 +471,7 @@ SUBDIRS = \
+$OpenBSD: patch-kpilot_conduits_Makefile_in,v 1.2 2007/02/01 07:25:35 espie Exp $
+--- kpilot/conduits/Makefile.in.orig	Thu Feb  1 01:10:33 2007
++++ kpilot/conduits/Makefile.in	Thu Feb  1 01:10:59 2007
+@@ -467,6 +467,7 @@ xdg_appsdir = @xdg_appsdir@
+ xdg_directorydir = @xdg_directorydir@
+ xdg_menudir = @xdg_menudir@
+ @include_malconduit_TRUE@MAL_SUBDIR = malconduit
++@include_malconduit_FALSE@MAL_SUBDIR = 
+ SUBDIRS = \
  	  abbrowserconduit \
  	  docconduit \
- 	  knotes \
-+	  malconduit \
- 	  memofileconduit \
- 	  notepadconduit \
+@@ -476,7 +477,8 @@ SUBDIRS = \
  	  popmail \
+ 	  sysinfoconduit \
+ 	  timeconduit \
+-	  vcalconduit
++	  vcalconduit \
++	  ${MAL_SUBDIR}
+ 
+ #>- all: all-recursive
+ #>+ 1