diff --git a/x11/tk/8.5/Makefile b/x11/tk/8.5/Makefile
index 3949a3c3200..145ba5d9696 100644
--- a/x11/tk/8.5/Makefile
+++ b/x11/tk/8.5/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.38 2015/06/06 12:13:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.39 2015/06/06 14:19:23 stu Exp $
 
 COMMENT =		graphical toolkit for Tcl
 
-DISTNAME =		tk8.5.16
-PKGNAME =		tk-8.5.16
-SHARED_LIBS =		tk85 0.13
+P =			18
+DISTNAME =		tk8.5.${P}
+PKGNAME =		tk-8.5.${P}
+SHARED_LIBS =		tk85 0.14
 CATEGORIES =		x11 x11/tk
 HOMEPAGE =		http://www.tcl.tk/
 MAINTAINER =		Stuart Cassoff <stwo@users.sourceforge.net>
@@ -17,11 +18,11 @@ WANTLIB =		X11 Xext Xft Xss c fontconfig m tcl85
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=tcl/}
 DISTFILES =		${DISTNAME}-src.tar.gz
 
-LIB_DEPENDS =		tcl-8.5.16:lang/tcl/8.5
+LIB_DEPENDS =		tcl-8.5.${P}:lang/tcl/8.5
 
-MAKE_FLAGS +=		TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' \
-			TCL_GENERIC_DIR='$$(GENERIC_DIR)' \
-			TCL_PLATFORM_DIR='$$(GENERIC_DIR)'
+MAKE_FLAGS =		TK_LIBRARY='$$(prefix)/lib/tcl/tk$$(VERSION)' \
+			TCL_GENERIC_DIR='${LOCALBASE}/include/tcl8.5' \
+			TCL_PLATFORM_DIR='$$(TCL_GENERIC_DIR)'
 
 FAKE_FLAGS =		INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
 			INSTALL_LIBRARY="${INSTALL_DATA}" \
@@ -44,7 +45,6 @@ CONFIGURE_ARGS +=	${CONFIGURE_SHARED} \
 			--disable-rpath \
 			--with-tcl="${LOCALBASE}/lib/tcl/tcl8.5" \
 			EXTRA_INSTALL="install-private-headers" \
-			EXTRA_CC_SWITCHES="-I${LOCALBASE}/include/tcl8.5" \
 			SHLIB_VERSION="${LIBtk85_VERSION}"
 
 .include <bsd.port.arch.mk>
diff --git a/x11/tk/8.5/distinfo b/x11/tk/8.5/distinfo
index 6d69b107b38..42a8ee4bce3 100644
--- a/x11/tk/8.5/distinfo
+++ b/x11/tk/8.5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tk8.5.16-src.tar.gz) = +8vnTWZd98sobQQlUjI6BRxhHFBoO+sY/G+1nr4pOZM=
-SIZE (tk8.5.16-src.tar.gz) = 4095839
+SHA256 (tk8.5.18-src.tar.gz) = AyiqMqVnT5rmB516v+7VWXdlzufKDpqowd7TLyfmwyo=
+SIZE (tk8.5.18-src.tar.gz) = 4101233
diff --git a/x11/tk/8.5/patches/patch-library_tk_tcl b/x11/tk/8.5/patches/patch-library_tk_tcl
index 7ef34ee4b3e..668b0440572 100644
--- a/x11/tk/8.5/patches/patch-library_tk_tcl
+++ b/x11/tk/8.5/patches/patch-library_tk_tcl
@@ -1,11 +1,12 @@
-$OpenBSD: patch-library_tk_tcl,v 1.4 2015/06/06 12:13:03 ajacoutot Exp $
---- library/tk.tcl.orig	Mon Jun 20 16:17:08 2011
-+++ library/tk.tcl	Wed Oct  5 11:26:28 2011
-@@ -55,12 +55,12 @@ namespace eval ::ttk {
+$OpenBSD: patch-library_tk_tcl,v 1.5 2015/06/06 14:19:23 stu Exp $
+--- library/tk.tcl.orig	Thu Feb 12 10:23:46 2015
++++ library/tk.tcl	Thu Jun  4 23:42:54 2015
+@@ -55,12 +55,13 @@ namespace eval ::ttk {
      }
  }
  
 -# Add Ttk & Tk's directory to the end of the auto-load search path, if it
++# OpenBSD layout.
 +# Add Tk's directory to the end of the auto-load search path, if it
  # isn't already on the path: