diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 9f1bbbc3dc6d..1738b69d7945 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -5,24 +5,26 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.61
-PORTREVISION=	1
+PORTVERSION=	0.61.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	Sybase/Microsoft TDS protocol library
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS=	${LOCALBASE}/bin/automake17:${PORTSDIR}/devel/automake17
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_GONFIGURE=	yes
 USE_LIBTOOL=	yes
+NO_AUTOCONF=	yes
+NO_AUTOMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-tdsver=4.2
+CONFIGURE_ARGS=	--with-tdsver=5.0
 INSTALLS_SHLIB=	yes
 
 MAN1=		freebcp.1 tsql.1
@@ -56,6 +58,11 @@ post-patch:
 		 s|/pool.conf|/pool.conf.dist|g ; \
 		 s| common.h||g'
 
+post-configure:
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e \
+		's|automake-1..|automake17|g ; \
+		 s|aclocal-1..|aclocal17|g' Makefile
+
 post-install:
 	@${MKDIR} ${PREFIX}/etc/freetds
 	@${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist
diff --git a/databases/freetds-devel/distinfo b/databases/freetds-devel/distinfo
index 4a0ea0201543..b78aa8cfb6a2 100644
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.61.tgz) = 15cc9829beb534606deb3020b3118eb9
+MD5 (freetds-0.61.2.tar.gz) = 95e91d26ddfdeed255771f3fa2c28129
diff --git a/databases/freetds-devel/files/patch-aclocal-m4 b/databases/freetds-devel/files/patch-aclocal-m4
new file mode 100644
index 000000000000..4538fd1e29b7
--- /dev/null
+++ b/databases/freetds-devel/files/patch-aclocal-m4
@@ -0,0 +1,11 @@
+--- aclocal.m4.orig	Wed Aug  6 07:55:55 2003
++++ aclocal.m4	Wed Aug  6 07:56:00 2003
+@@ -441,7 +441,7 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+-AC_PREREQ([2.54])
++AC_PREREQ([2.53])
+ 
+ # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+ # the ones we care about.
diff --git a/databases/freetds-devel/pkg-plist b/databases/freetds-devel/pkg-plist
index 8216ee293489..ab144430ae05 100644
--- a/databases/freetds-devel/pkg-plist
+++ b/databases/freetds-devel/pkg-plist
@@ -21,6 +21,8 @@ include/tds_sysdep_public.h
 include/tdsconvert.h
 include/tdssrv.h
 include/tdsver.h
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 lib/libct.a
 lib/libct.so
 lib/libct.so.1
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 9f1bbbc3dc6d..1738b69d7945 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -5,24 +5,26 @@
 # $FreeBSD$
 
 PORTNAME=	freetds
-PORTVERSION=	0.61
-PORTREVISION=	1
+PORTVERSION=	0.61.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_SUNSITE}
 MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kiesel@schlund.de
 COMMENT=	Sybase/Microsoft TDS protocol library
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
+BUILD_DEPENDS=	${LOCALBASE}/bin/automake17:${PORTSDIR}/devel/automake17
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+GNU_GONFIGURE=	yes
 USE_LIBTOOL=	yes
+NO_AUTOCONF=	yes
+NO_AUTOMAKE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--with-tdsver=4.2
+CONFIGURE_ARGS=	--with-tdsver=5.0
 INSTALLS_SHLIB=	yes
 
 MAN1=		freebcp.1 tsql.1
@@ -56,6 +58,11 @@ post-patch:
 		 s|/pool.conf|/pool.conf.dist|g ; \
 		 s| common.h||g'
 
+post-configure:
+	@cd ${WRKSRC} && ${REINPLACE_CMD} -e \
+		's|automake-1..|automake17|g ; \
+		 s|aclocal-1..|aclocal17|g' Makefile
+
 post-install:
 	@${MKDIR} ${PREFIX}/etc/freetds
 	@${INSTALL_DATA} ${WRKSRC}/interfaces ${PREFIX}/etc/freetds/interfaces.dist
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index 4a0ea0201543..b78aa8cfb6a2 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1 +1 @@
-MD5 (freetds-0.61.tgz) = 15cc9829beb534606deb3020b3118eb9
+MD5 (freetds-0.61.2.tar.gz) = 95e91d26ddfdeed255771f3fa2c28129
diff --git a/databases/freetds/files/patch-aclocal-m4 b/databases/freetds/files/patch-aclocal-m4
new file mode 100644
index 000000000000..4538fd1e29b7
--- /dev/null
+++ b/databases/freetds/files/patch-aclocal-m4
@@ -0,0 +1,11 @@
+--- aclocal.m4.orig	Wed Aug  6 07:55:55 2003
++++ aclocal.m4	Wed Aug  6 07:56:00 2003
+@@ -441,7 +441,7 @@
+ # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+ 
+ 
+-AC_PREREQ([2.54])
++AC_PREREQ([2.53])
+ 
+ # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+ # the ones we care about.
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index 8216ee293489..ab144430ae05 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -21,6 +21,8 @@ include/tds_sysdep_public.h
 include/tdsconvert.h
 include/tdssrv.h
 include/tdsver.h
+share/nls/POSIX
+share/nls/en_US.US-ASCII
 lib/libct.a
 lib/libct.so
 lib/libct.so.1