diff --git a/x11-toolkits/tk90/Makefile b/x11-toolkits/tk90/Makefile
index 83259a6d9959..24b8eb1ad770 100644
--- a/x11-toolkits/tk90/Makefile
+++ b/x11-toolkits/tk90/Makefile
@@ -1,93 +1,100 @@
 PORTNAME=	tk
 DISTVERSION=	${TK_VERSION}${TK_RC}
 PORTREVISION=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF/tcl/Tcl/${TK_VERSION}
 PKGNAMESUFFIX=	${SHORT_TK_VER}
 DISTNAME=	${PORTNAME}${DISTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Graphical toolkit for Tcl
 WWW=		https://www.tcl.tk/
 
 LICENSE=	TclTk
 LICENSE_NAME=	Tcl/Tk License
 LICENSE_FILE=	${WRKSRC}/../license.terms
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	zip:archivers/zip
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig
 
 OPTIONS_DEFINE=	TKMAN DEMOS
 OPTIONS_SUB=	yes
 TKMAN_DESC=	Install Tk function manpages
 DEMOS_DESC=	Install demos
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${TK_VERSION}
 WRKSRC_SUBDIR=	unix
 
 ALL_TARGET=	all
-INSTALL_TARGET=	install-strip install-libraries
+INSTALL_TARGET=	install-libraries
 TEST_TARGET=	test
 
 USES+=		tcl:${SHORT_TK_VER},tea xorg
 USE_LDCONFIG=	yes
 USE_XORG=	x11 xext xft xrender xscrnsaver
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS=	--enable-xss \
 		--enable-xft \
 		--enable-shared \
 		--enable-man-suffix=.${MAN_SUFFIX} \
 		--includedir=${PREFIX}/include/tk${TK_VER}
 
 CFLAGS+=	-I${TCL_INCLUDEDIR} \
 		-I${LOCALBASE}/include
 
 TK_VERSION=	9.0.0
 TK_VER=		${TK_VERSION:R}
 TK_RC=
 SHORT_TK_VER=	${TK_VER:S/.//}
 MAN_SUFFIX=	${PKGBASE}
 
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
 
 PLIST_SUB=	TK_VER=${TK_VER} \
 		SHORT_TK_VER=${SHORT_TK_VER}
 
 DEMOS_INSTALL_TARGET=	install-demos
 TKMAN_INSTALL_TARGET=	install-doc
 
+.if defined(WITH_DEBUG)
+CONFIGURE_ARGS+=--enable-symbols
+INSTALL_TARGET+=install
+.else
+INSTALL_TARGET+=install-strip
+.endif
+
 post-patch:
 	${REINPLACE_CMD} \
 		-e 's|libtkstub.a|libtkstub${TK_VER}.a|' \
 		-e 's|-ltkstub|-ltkstub${TK_VER}|' \
 		-e 's|-O2||' \
 		${WRKSRC}/configure
 	${REINPLACE_CMD} -e \
 	    's|@TK_BUILD_LIB_SPEC@|@TK_LIB_SPEC@|; \
 	     s|@TK_BUILD_STUB_LIB_SPEC@|@TK_STUB_LIB_SPEC@|; \
 	     s|@TK_BUILD_STUB_LIB_PATH@|@TK_STUB_LIB_PATH@|; \
 	     s|@TK_SRC_DIR@|${PREFIX}/include/tk${TK_VER}|' \
 	     ${WRKSRC}/tkConfig.sh.in
 	${REINPLACE_CMD} \
 		-e '/^CONFIG_INSTALL_DIR/s|= .*$$|= $${SCRIPT_INSTALL_DIR}|' \
 		-e 's|$$(LIB_INSTALL_DIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|g' \
 		-e 's|pkgconfig/tk.pc|pkgconfig/tk${SHORT_TCL_VER}.pc|' \
 		-e 's|strip -x|strip --strip-unneeded|' \
 		-e 's|TCL_BUILD_LIB_SPEC|TCL_LIB_SPEC|' \
 		${WRKSRC}/Makefile.in
 	${REINPLACE_CMD} \
 		-e '/Target=/s|.$$Section$$Suffix|$$Suffix.$$Section|' \
 		${WRKSRC}/installManPage
 
 post-install:
 	# Make sure users of USES=tk:90 are able to look up the library
 	${LN} -fs libtk${TK_VER}.so ${STAGEDIR}${PREFIX}/lib/libtk${PKGNAMESUFFIX}.so
 	${LN} -fs libtk${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/libtk${PKGNAMESUFFIX}.so.1
 
 do-test:
 	cd ${WRKSRC} && ${MAKE} test
 
 .include <bsd.port.mk>