diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 4113f575baf5..0368b8ced96d 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,77 +1,84 @@
 # Created by: Domas Mituzas <midom@dammit.lt>
 
 PORTNAME=	freetds
-PORTVERSION=	1.3.4
+PORTVERSION=	1.3.6
 PORTEPOCH=	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
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
 
-USES=		autoreconf cpe gettext gmake iconv libtool:keepla pkgconfig readline tar:bzip2
-
-TDS_VER?=	7.4
+USES=		autoreconf cpe gettext gmake iconv libtool:keepla pkgconfig \
+		readline tar:bzip2
+USE_LDCONFIG=	yes
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-msdblib \
+		--enable-sybase-compat \
+		--sysconfdir=${ETCDIR} \
+		--with-tdsver=${TDS_VER}
+
+INSTALL_TARGET=	install-strip
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 LIBS+=		-lgcrypt -lpthread
-CONFIGURE_ARGS=	--with-tdsver=${TDS_VER} --sysconfdir=${ETCDIR} \
-		--enable-sybase-compat --enable-msdblib
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
 
 CONFLICTS=	freetds-devel
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=		DOCS MARS
-OPTIONS_SINGLE=		SSL ODBC
-OPTIONS_SINGLE_SSL=	OPENSSL GNUTLS
-OPTIONS_DEFAULT=	OPENSSL MARS UNIXODBC
+OPTIONS_DEFAULT=	MARS OPENSSL UNIXODBC
+OPTIONS_SINGLE=		ODBC SSL
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
-OPENSSL_USES=		ssl
-OPENSSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
+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}
-MARS_DESC=	Enable MARS code (Experimental)
-MARS_CONFIGURE_ON=	--enable-mars
+
+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
 	@${REINPLACE_CMD} -e 's|/pool.conf|/pool.conf.sample|g' \
 		 ${WRKSRC}/src/pool/Makefile.am
 	@${REINPLACE_CMD} -e 's|\($$with_iodbc/include\)|\1/libiodbc|g' \
 		${WRKSRC}/configure.ac
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/interfaces ${STAGEDIR}${ETCDIR}/interfaces.sample
 
 .include <bsd.port.mk>
diff --git a/databases/freetds/distinfo b/databases/freetds/distinfo
index b3173fb5a2db..c6e4ce32a3a3 100644
--- a/databases/freetds/distinfo
+++ b/databases/freetds/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1639581430
-SHA256 (freetds-1.3.4.tar.bz2) = 89bb8f9c96f966eb34f28fdef7f30123271f6b04c6d5db60ced3a0522d3518ae
-SIZE (freetds-1.3.4.tar.bz2) = 2244196
+TIMESTAMP = 1642519958
+SHA256 (freetds-1.3.6.tar.bz2) = 2290e7565bacc49bf6d8f0f5ac7d31ed5a6da4fe64bb9aa354c887789e283ffb
+SIZE (freetds-1.3.6.tar.bz2) = 2244695