diff --git a/databases/sqsh/Makefile b/databases/sqsh/Makefile
index 5d06145e1e4..b69c6e7f999 100644
--- a/databases/sqsh/Makefile
+++ b/databases/sqsh/Makefile
@@ -1,24 +1,27 @@
-# $OpenBSD: Makefile,v 1.25 2013/03/11 02:52:09 espie Exp $
+# $OpenBSD: Makefile,v 1.26 2014/06/07 10:48:39 sthen Exp $
 
 COMMENT=	SQL shell for FreeTDS
 
-DISTNAME=	sqsh-2.1.8
+DISTNAME=	sqsh-2.5.16.1
+WRKDIST=	${WRKDIR}/sqsh-2.5
+EXTRACT_SUFX=	.tgz
 
 CATEGORIES=	databases shells
 
-HOMEPAGE=	http://www.sqsh.org/
+HOMEPAGE=	http://sourceforge.net/projects/sqsh/
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += c ct>=2 curses m readline
+WANTLIB += c ct>=2 ncurses m pthread readline
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=sqsh/}
 
-MODULES=	devel/gettext
+MODULES=	converters/libiconv
 LIB_DEPENDS=	databases/freetds
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=  autoconf
+AUTOCONF_VERSION= 2.69
 CONFIGURE_ARGS=	--with-readline
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
diff --git a/databases/sqsh/distinfo b/databases/sqsh/distinfo
index 838ef2a6b1b..f467a8afaf3 100644
--- a/databases/sqsh/distinfo
+++ b/databases/sqsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sqsh-2.1.8.tar.gz) = Na+ualWE2UHLv2DG7y+jm0spppWFlUivewzngj0zhPc=
-SIZE (sqsh-2.1.8.tar.gz) = 521251
+SHA256 (sqsh-2.5.16.1.tgz) = 1mQfNlrOYCJfwPpI+Cudvtd6TlBqDkl+toieCWuDIPI=
+SIZE (sqsh-2.5.16.1.tgz) = 623715
diff --git a/databases/sqsh/patches/patch-aclocal_m4 b/databases/sqsh/patches/patch-aclocal_m4
new file mode 100644
index 00000000000..e8366e570f9
--- /dev/null
+++ b/databases/sqsh/patches/patch-aclocal_m4
@@ -0,0 +1,23 @@
+$OpenBSD: patch-aclocal_m4,v 1.1 2014/06/07 10:48:39 sthen Exp $
+--- aclocal.m4.orig	Sat Jun  7 11:03:08 2014
++++ aclocal.m4	Sat Jun  7 11:04:37 2014
+@@ -274,10 +274,6 @@ AC_DEFUN([AC_SYBASE_ASE], [
+ 			else
+ 				SYBASE_LIBDIR="$SYBASE_OCOS/lib"
+ 			fi
+-			if [[ ! -f $SYBASE_LIBDIR/libct.so ]]; then
+-				AC_MSG_RESULT(fail)
+-				AC_MSG_ERROR([No properly installed FreeTDS or Sybase environment found in ${SYBASE_OCOS}.])
+-			fi
+ 			case "${host_os}" in
+ 	                        *cygwin)
+ 					SYBASE_LIBS="-lct"
+@@ -364,6 +360,8 @@ AC_DEFUN([AC_SYBASE_ASE], [
+ 		case "${host_os}" in
+ 			linux*)
+ 				SYBASE_OS="-ldl -lm";;
++			openbsd*)
++				SYBASE_OS="-lm";;
+ 			irix*)
+ 				SYBASE_OS="-lnsl -lm";;
+ 			ncr*)
diff --git a/databases/sqsh/patches/patch-configure b/databases/sqsh/patches/patch-configure
deleted file mode 100644
index 99d2af20ebb..00000000000
--- a/databases/sqsh/patches/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-configure,v 1.6 2012/11/20 22:17:29 sthen Exp $
---- configure.orig	Wed May  2 12:27:55 2012
-+++ configure	Tue Nov 20 22:04:16 2012
-@@ -3545,6 +3545,8 @@ $as_echo_n "checking Open Client OS libraries... " >&6
- 				SYBASE_OS="-lm -ldl -ldgc";;
- 			aix*)
- 				SYBASE_OS="-lm";;
-+			openbsd*)
-+				SYBASE_OS="-lm -liconv";;
- 			*)
- 				SYBASE_OS="-lm -ldl";;
- 		esac