diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 5e113ca13651..ad870e1cad61 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -1,35 +1,33 @@
 # New ports collection makefile for:	sylpheed-claws-vcalendar
 # Date created:	3 April 2006
 # Whom:	Pawel Pekala <c0rn@o2.pl>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	vcalendar
 PORTVERSION=	1.89.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
 PKGNAMEPREFIX=	sylpheed-claws-
 
 MAINTAINER=	c0rn@o2.pl
 COMMENT=	vCalendar plugin for sylpheed-claws
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
 RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 	--with-libintl-prefix=${LOCALBASE}
 
-pre-configure:
-	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION} && ${AUTOHEADER}
-
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-vcalendar/files/patch-configure.ac b/mail/claws-mail-vcalendar/files/patch-configure.ac
new file mode 100644
index 000000000000..da0d0995037b
--- /dev/null
+++ b/mail/claws-mail-vcalendar/files/patch-configure.ac
@@ -0,0 +1,8 @@
+--- configure.ac.orig	Sun Oct  1 11:28:13 2006
++++ configure.ac	Sun Oct  1 11:28:27 2006
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.60)
++AC_PREREQ(2.59)
+ AC_INIT(src/plugin.c)
+ AC_CONFIG_AUX_DIR(config)
+ AM_MAINTAINER_MODE
diff --git a/mail/sylpheed-claws-vcalendar/Makefile b/mail/sylpheed-claws-vcalendar/Makefile
index 5e113ca13651..ad870e1cad61 100644
--- a/mail/sylpheed-claws-vcalendar/Makefile
+++ b/mail/sylpheed-claws-vcalendar/Makefile
@@ -1,35 +1,33 @@
 # New ports collection makefile for:	sylpheed-claws-vcalendar
 # Date created:	3 April 2006
 # Whom:	Pawel Pekala <c0rn@o2.pl>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	vcalendar
 PORTVERSION=	1.89.1
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://sylpheed-claws.net/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	miwi
 PKGNAMEPREFIX=	sylpheed-claws-
 
 MAINTAINER=	c0rn@o2.pl
 COMMENT=	vCalendar plugin for sylpheed-claws
 
 LIB_DEPENDS=	curl.3:${PORTSDIR}/ftp/curl
 BUILD_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
 RUN_DEPENDS=	sylpheed-claws>=2.5:${PORTSDIR}/mail/sylpheed-claws
 
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_AUTOTOOLS=	autoconf:259
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 	--with-libintl-prefix=${LOCALBASE}
 
-pre-configure:
-	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION} && ${AUTOHEADER}
-
 .include <bsd.port.mk>
diff --git a/mail/sylpheed-claws-vcalendar/files/patch-configure.ac b/mail/sylpheed-claws-vcalendar/files/patch-configure.ac
new file mode 100644
index 000000000000..da0d0995037b
--- /dev/null
+++ b/mail/sylpheed-claws-vcalendar/files/patch-configure.ac
@@ -0,0 +1,8 @@
+--- configure.ac.orig	Sun Oct  1 11:28:13 2006
++++ configure.ac	Sun Oct  1 11:28:27 2006
+@@ -1,4 +1,4 @@
+-AC_PREREQ(2.60)
++AC_PREREQ(2.59)
+ AC_INIT(src/plugin.c)
+ AC_CONFIG_AUX_DIR(config)
+ AM_MAINTAINER_MODE