diff --git a/databases/pgtcl/Makefile b/databases/pgtcl/Makefile
index e674e3ed9e7..fff63cd8993 100644
--- a/databases/pgtcl/Makefile
+++ b/databases/pgtcl/Makefile
@@ -1,14 +1,16 @@
-# $OpenBSD: Makefile,v 1.13 2016/03/18 23:12:16 naddy Exp $
+# $OpenBSD: Makefile,v 1.14 2017/05/10 01:10:50 stu Exp $
 
 COMMENT=	Tcl interface to PostgreSQL
 
-DISTNAME=	pgtcl-1.7
-SHARED_LIBS= 	pgtcl17	0.0
+V =		1.7
+
+DISTNAME=	pgtcl-${V}
+REVISION=	0
 CATEGORIES=	databases
 
 HOMEPAGE=	http://pgfoundry.org/projects/pgtcl/
 
-MAINTAINER=	Valery Masiutsin <val.masutin@gmail.com>
+MAINTAINER=	Stuart Cassoff <stwo@users.sourceforge.net>
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -27,15 +29,19 @@ CONFIGURE_ARGS=	--with-tcl=${MODTCL_LIBDIR} \
 		--libdir=${MODTCL_TCLDIR} \
 		--with-postgres-include=${LOCALBASE}/include/postgresql \
 		--with-postgres-lib=${LOCALBASE}/lib \
-		--disable-threads \
-		SHLIB_VERSION=${LIBpgtcl17_VERSION}
+		--disable-threads
+
+FAKE_FLAGS =	PKG_DIR='$$(PACKAGE_NAME)' INSTALL_PROGRAM='$$(INSTALL_DATA)' \
+		PKG_HEADERS='' PKG_TCL_SOURCES=''
 
-FAKE_FLAGS=	PKG_DIR=pgtcl INSTALL_LIBRARY='${INSTALL_DATA}' PKG_HEADERS=
 NO_TEST=	Yes
 WRKDIST =	${WRKDIR}/lib${DISTNAME}
 ALL_TARGET =	 binaries libraries
 INSTALL_TARGET =install-binaries install-libraries
 SEPARATE_BUILD =Yes
+SUBST_VARS =	VER
+
+VER =		${V:S/.//g}
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pgtcl/html
diff --git a/databases/pgtcl/patches/patch-configure b/databases/pgtcl/patches/patch-configure
index ea437a64e79..762e05f2dfe 100644
--- a/databases/pgtcl/patches/patch-configure
+++ b/databases/pgtcl/patches/patch-configure
@@ -1,4 +1,4 @@
-$OpenBSD: patch-configure,v 1.2 2012/07/04 19:23:46 stu Exp $
+$OpenBSD: patch-configure,v 1.3 2017/05/10 01:10:50 stu Exp $
 --- configure.orig	Mon Apr 30 20:54:06 2012
 +++ configure	Mon Apr 30 20:59:24 2012
 @@ -7826,7 +7826,7 @@ fi
@@ -15,7 +15,7 @@ $OpenBSD: patch-configure,v 1.2 2012/07/04 19:23:46 stu Exp $
  
  	    LD_SEARCH_FLAGS=${CC_SEARCH_FLAGS}
 -	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.${SHLIB_VERSION}'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so'
  	    { echo "$as_me:$LINENO: checking for ELF" >&5
  echo $ECHO_N "checking for ELF... $ECHO_C" >&6; }
  if test "${tcl_cv_ld_elf+set}" = set; then
diff --git a/databases/pgtcl/pkg/PLIST b/databases/pgtcl/pkg/PLIST
index 96e4dac9eaa..ff974e42b03 100644
--- a/databases/pgtcl/pkg/PLIST
+++ b/databases/pgtcl/pkg/PLIST
@@ -1,7 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.2 2012/07/04 19:23:46 stu Exp $
+@comment $OpenBSD: PLIST,v 1.3 2017/05/10 01:10:50 stu Exp $
 lib/tcl/pgtcl/
-@lib lib/tcl/pgtcl/libpgtcl17.so.${LIBpgtcl17_VERSION}
-lib/tcl/pgtcl/pgtcl.tcl
+lib/tcl/pgtcl/libpgtcl${VER}.so
 lib/tcl/pgtcl/pkgIndex.tcl
 share/doc/pgtcl/
 share/doc/pgtcl/html/