diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 0d32e406907a..37e83f67c0a0 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,82 +1,83 @@
 PORTNAME=	freetds
 PORTVERSION=	1.4.10
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	https://www.freetds.org/files/stable/ \
 		ftp://ftp.freetds.org/pub/freetds/stable/
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Sybase/Microsoft TDS protocol library
 WWW=		http://www.freetds.org/
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
-USES=		autoreconf cpe gettext gmake iconv libtool:keepla localbase:ldflag \
+USES=		cpe gettext gmake iconv libtool:keepla localbase:ldflags \
 		pkgconfig readline tar:bzip2
 USE_LDCONFIG=	yes
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-msdblib \
 		--enable-sybase-compat \
 		--sysconfdir=${ETCDIR} \
 		--with-tdsver=${TDS_VER}
 
 INSTALL_TARGET=	install-strip
 
 LIBS+=		-lgcrypt -lpthread
 
 CONFLICTS=	freetds-devel
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS MARS
 OPTIONS_DEFAULT=	MARS OPENSSL UNIXODBC
 OPTIONS_SINGLE=		ODBC SSL
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
 
 MARS_DESC=	Enable MARS code (Experimental)
 
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ON=	--with-gnutls
 IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
 IODBC_CONFIGURE_ON=	--with-iodbc=${LOCALBASE}
 IODBC_CPPFLAGS=		-I${LOCALBASE}/include/libiodbc
 MARS_CONFIGURE_ON=	--enable-mars
 OPENSSL_USES=		ssl
 OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 UNIXODBC_CONFIGURE_ON=	--with-unixodbc=${LOCALBASE}
 
 TDS_VER?=	7.4
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
 post-extract:
 	@cd ${WRKSRC} && ${LN} -s freetds.conf freetds.conf.sample
 	@cd ${WRKSRC} && ${LN} -s locales.conf locales.conf.sample
 	@cd ${WRKSRC}/src/pool && ${LN} -s pool.conf pool.conf.sample
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/freetds.conf|/freetds.conf.sample|g ; \
-		 s|/locales.conf|/locales.conf.sample|g ; \
-		 s| common.h||g' \
-		 ${WRKSRC}/Makefile.am
+		s|/locales.conf|/locales.conf.sample|g ; \
+		s| common.h||g' \
+		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
-		 ${WRKSRC}/src/pool/Makefile.am
+		${WRKSRC}/src/pool/Makefile.in
 	@${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g ; \
-		 s| odbcss.h||g' \
-		${WRKSRC}/configure.ac
+		s| odbcss.h||g' \
+		${WRKSRC}/configure
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
 
 .include <bsd.port.mk>
diff --git a/databases/freetds/pkg-plist b/databases/freetds/pkg-plist
index 277e7f237664..e7b2074e755e 100644
--- a/databases/freetds/pkg-plist
+++ b/databases/freetds/pkg-plist
@@ -1,49 +1,49 @@
 bin/bsqldb
 bin/datacopy
 bin/defncopy
 bin/freebcp
 bin/fisql
 bin/osql
 bin/tdspool
 bin/tsql
 @sample %%ETCDIR%%/freetds.conf.sample
 @sample %%ETCDIR%%/interfaces.sample
 @sample %%ETCDIR%%/locales.conf.sample
 @sample %%ETCDIR%%/pool.conf.sample
 include/bkpublic.h
 include/cspublic.h
 include/cstypes.h
 include/ctpublic.h
 include/odbcss.h
 include/sqldb.h
 include/sqlfront.h
 include/sybdb.h
 include/syberror.h
 include/sybfront.h
 include/tds_sysdep_public.h
 lib/libct.a
 lib/libct.la
 lib/libct.so
 lib/libct.so.4
 lib/libct.so.4.0.0
 lib/libsybdb.a
 lib/libsybdb.la
 lib/libsybdb.so
 lib/libsybdb.so.5
 lib/libsybdb.so.5.1.0
-man/man1/bsqldb.1.gz
-man/man1/bsqlodbc.1.gz
-man/man1/datacopy.1.gz
-man/man1/defncopy.1.gz
-man/man1/fisql.1.gz
-man/man1/freebcp.1.gz
-man/man1/osql.1.gz
-man/man1/tsql.1.gz
-man/man5/freetds.conf.5.gz
+share/man/man1/bsqldb.1.gz
+share/man/man1/bsqlodbc.1.gz
+share/man/man1/datacopy.1.gz
+share/man/man1/defncopy.1.gz
+share/man/man1/fisql.1.gz
+share/man/man1/freebcp.1.gz
+share/man/man1/osql.1.gz
+share/man/man1/tsql.1.gz
+share/man/man5/freetds.conf.5.gz
 %%ODBC%%bin/bsqlodbc
 %%ODBC%%lib/libtdsodbc.so
 %%ODBC%%lib/libtdsodbc.so.0
 %%ODBC%%lib/libtdsodbc.so.0.0.0
 %%ODBC%%lib/libtdsodbc.la
 %%ODBC%%lib/libtdsodbc.a
 %%PORTDOCS%%@dir %%DOCSDIR%%/images/callouts