diff --git a/templates/sqlite-devel b/templates/sqlite-devel
new file mode 120000
index 00000000000..90a746152e8
--- /dev/null
+++ b/templates/sqlite-devel
@@ -0,0 +1 @@
+sqlite
\ No newline at end of file
diff --git a/templates/sqlite/depends b/templates/sqlite/depends
new file mode 100644
index 00000000000..ec5dfc9cf3f
--- /dev/null
+++ b/templates/sqlite/depends
@@ -0,0 +1,2 @@
+abi_depends=3.6.13
+api_depends=${abi_depends}
diff --git a/templates/sqlite/devel.template b/templates/sqlite/devel.template
new file mode 100644
index 00000000000..9e0c4773e76
--- /dev/null
+++ b/templates/sqlite/devel.template
@@ -0,0 +1,17 @@
+# Template file for 'sqlite-devel'.
+#
+short_desc="${sourcepkg} (development files)"
+long_desc="${long_desc}
+
+ This package contains files for development, headers, static libs, etc."
+
+Add_dependency run sqlite
+
+do_install()
+{
+	mkdir -p ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.*a ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/lib*.so ${DESTDIR}/usr/lib
+	mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib
+}
diff --git a/templates/sqlite/template b/templates/sqlite/template
index c500b86ad99..ea534a7696a 100644
--- a/templates/sqlite/template
+++ b/templates/sqlite/template
@@ -1,14 +1,15 @@
 # Template build file for 'sqlite'.
 pkgname=sqlite
-version=3.6.4
+sourcepkg=$pkgname
+version=3.6.13
 distfiles="http://sqlite.org/$pkgname-$version.tar.gz"
 build_style=gnu_configure
-configure_args="--disable-tcl --enable-load-extension --with-readline-inc="
-make_cmd="$XBPS_MASTERDIR/bin/gmake"
-pkgconfig_override="sqlite3.pc"
+configure_env="CPPFLAGS=-DSQLITE_ENABLE_COLUMN_METADATA=1 LIBS=-ldl"
+configure_args="--disable-tcl --enable-load-extension --enable-threadsafe
+ --enable-threads-override-locks --enable-cross-thread-connections"
 short_desc="SQL Database Engine in a C Library"
 maintainer="Juan RP <xtraeme@gmail.com>"
-checksum=b420b8a196807feb5162f293ea64e7741a633e92
+checksum=2ca2591847df72224dd6f99c8fffe35bb63bf41a8519d8e15ad48141aa841bfa
 long_desc="
  SQLite is a C library that implements an SQL database engine. Programs
  that link with the SQLite library can have SQL database access without
@@ -20,3 +21,14 @@ long_desc="
  SQLite is not a client library used to connect to a big database server.
  SQLite is the server. The SQLite library reads and writes directly to and
  from the database files on disk."
+
+subpackages="devel"
+Add_dependency full glibc
+Add_dependency full readline
+
+post_install()
+{
+	# Install the manpage
+	install -D -m644 ${wrksrc}/sqlite3.1 \
+		${DESTDIR}/usr/share/man/man1/sqlite3.1
+}