diff --git a/databases/sqlite2/Makefile b/databases/sqlite2/Makefile
index 49850895a000..60c47c96600c 100644
--- a/databases/sqlite2/Makefile
+++ b/databases/sqlite2/Makefile
@@ -12,17 +12,30 @@
 # SQLITE_WITH_TCL83 and SQLITE_WITH_TCL84.
 
 PORTNAME=	sqlite
-PORTVERSION=	2.8.16
+PORTVERSION=	2.8.17
 CATEGORIES=	databases
 MASTER_SITES=	http://www.sqlite.org/
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	An SQL database engine in a C library w/ Tcl wrapper
 
+USE_GMAKE=	YES
+USE_GNOME=	pkgconfig
+USE_AUTOTOOLS=	libtool:15
+GNU_CONFIGURE=	YES
+USE_REINPLACE=	YES
+INSTALLS_SHLIB=	YES
+
+CONFIGURE_ARGS=		--prefix=${PREFIX} --with-hints=freebsd.hints
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+
+PORTDOCS=	*
 DOCSDIR=	${PREFIX}/share/doc/sqlite2
 EXAMPLESDIR=	${PREFIX}/share/examples/sqlite2
 LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}2
 
+EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude CVS
+
 # Defaults, for building the docs:
 TCL_V=		8.4
 TCL_SHORT_V=	84
@@ -54,50 +67,30 @@ MAKE_ARGS+=	TCLSH=tclsh${TCL_V}
 MAKE_ENV+=	TCL_VER=${TCL_V}
 .endif
 
-USE_GMAKE=	YES
-USE_GNOME=	pkgconfig
-USE_AUTOTOOLS=	libtool:15
-GNU_CONFIGURE=	YES
-USE_REINPLACE=	YES
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-hints=freebsd.hints
-CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
-ALL_TARGET=	all
-#.if defined(WITH_TCL)
-#ALL_TARGET+=	libtclsqlite.la
-#.endif
-
-INSTALLS_SHLIB=	YES
-
 .include <bsd.port.pre.mk>
 
-DOCFILES!=	${AWK} 'BEGIN {FS="/"}; /^%%PORTDOCS%%%%DOCSDIR%%/{print $$2}' ${.CURDIR}/pkg-plist
-
 post-patch:
 	@${REINPLACE_CMD} -e "s/tclsh \$$(TOP)/\$$(TCLSH) \$$(TOP)/g" \
-			 -e "s|\./libtool|${LIBTOOL}|g" \
-			 ${WRKSRC}/Makefile.in
+		 -e "s|\./libtool|${LIBTOOL}|g" ${WRKSRC}/Makefile.in
 	@${ECHO} "config_TARGET_TCL_INC=\"-I${PREFIX}/include/tcl${TCL_V}\"" >${WRKSRC}/freebsd.hints
 	@${ECHO} "config_TARGET_TCL_LIBS=\"-L${PREFIX}/lib -ltcl${TCL_SHORT_V}\"" >>${WRKSRC}/freebsd.hints
-	#@${ECHO} "config_TARGET_CFLAGS=\"-DTHREADSAFE=1 -pthread\"" >>${WRKSRC}/freebsd.hints
 
 post-build:
-	# Build the docs
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc
+	@${ECHO_MSG} "===> Building docs"
+	@(cd ${WRKSRC} && ${GMAKE} ${MAKE_ARGS} doc)
 .endif
 
 post-install:
 .if defined(WITH_TCL)
-	cd ${WRKSRC} && ${GMAKE} install-tcl
+	@(cd ${WRKSRC} && ${GMAKE} install-tcl)
 	${INSTALL_DATA} ${FILESDIR}/pkgIndex.tcl ${PREFIX}/lib/sqlite/
 .endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
+.endif
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/example.tcl ${EXAMPLESDIR}
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/databases/sqlite2/distinfo b/databases/sqlite2/distinfo
index 14bf14a15abd..37710be44602 100644
--- a/databases/sqlite2/distinfo
+++ b/databases/sqlite2/distinfo
@@ -1,3 +1,3 @@
-MD5 (sqlite-2.8.16.tar.gz) = 9c79b461ff30240a6f9d70dd67f8faea
-SHA256 (sqlite-2.8.16.tar.gz) = d26e8a6fac1ad497a3ade719da4f1d6d60f586fd10f66253f1c3d3db7168984e
-SIZE (sqlite-2.8.16.tar.gz) = 981834
+MD5 (sqlite-2.8.17.tar.gz) = 838dbac20b56d2c4292e98848505a05b
+SHA256 (sqlite-2.8.17.tar.gz) = 3f35ebfb67867fb5b583a03e480f900206af637efe7179b32294a6a0cf806f37
+SIZE (sqlite-2.8.17.tar.gz) = 969805
diff --git a/databases/sqlite2/pkg-plist b/databases/sqlite2/pkg-plist
index aa4afe667438..24ee78b8c98d 100644
--- a/databases/sqlite2/pkg-plist
+++ b/databases/sqlite2/pkg-plist
@@ -7,29 +7,5 @@ libdata/pkgconfig/sqlite.pc
 %%WITH_TCL%%lib/sqlite/libtclsqlite.so
 %%WITH_TCL%%lib/sqlite/pkgIndex.tcl
 %%WITH_TCL%%@dirrm lib/sqlite
-%%PORTDOCS%%%%DOCSDIR%%/arch.html
-%%PORTDOCS%%%%DOCSDIR%%/arch.png
-%%PORTDOCS%%%%DOCSDIR%%/c_interface.html
-%%PORTDOCS%%%%DOCSDIR%%/changes.html
-%%PORTDOCS%%%%DOCSDIR%%/conflict.html
-%%PORTDOCS%%%%DOCSDIR%%/datatypes.html
-%%PORTDOCS%%%%DOCSDIR%%/download.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/fileformat.html
-%%PORTDOCS%%%%DOCSDIR%%/formatchng.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/lang.html
-%%PORTDOCS%%%%DOCSDIR%%/lemon.html
-%%PORTDOCS%%%%DOCSDIR%%/mingw.html
-%%PORTDOCS%%%%DOCSDIR%%/nulls.html
-%%PORTDOCS%%%%DOCSDIR%%/omitted.html
-%%PORTDOCS%%%%DOCSDIR%%/opcode.html
-%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
-%%PORTDOCS%%%%DOCSDIR%%/report1.txt
-%%PORTDOCS%%%%DOCSDIR%%/speed.html
-%%PORTDOCS%%%%DOCSDIR%%/sqlite.html
-%%PORTDOCS%%%%DOCSDIR%%/tclsqlite.html
-%%PORTDOCS%%%%DOCSDIR%%/vdbe.html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/example.tcl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%EXAMPLESDIR%%/example.tcl
+@dirrm %%EXAMPLESDIR%%