diff --git a/ca-certificates/PKGBUILD b/ca-certificates/PKGBUILD
index 88814b8e..91c65e3a 100644
--- a/ca-certificates/PKGBUILD
+++ b/ca-certificates/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=ca-certificates
 pkgver=1.96
-pkgrel=1
+pkgrel=3
 pkgdesc='Common CA certificates'
 arch=('any')
 url='http://www.mozilla.org/projects/security/certs/'
diff --git a/ca-certificates/ca-certificates.install b/ca-certificates/ca-certificates.install
index a5ab4c9e..a04f2e9a 100644
--- a/ca-certificates/ca-certificates.install
+++ b/ca-certificates/ca-certificates.install
@@ -1,7 +1,22 @@
 export LC_ALL=C
 
 post_install() {
-	usr/bin/update-ca-trust >/dev/null 2>&1
+	DEST=usr/etc/pki/ca-trust/extracted
+
+	# OpenSSL PEM bundle that includes trust flags
+	# (BEGIN TRUSTED CERTIFICATE)
+	usr/bin/p11-kit extract --format=openssl-bundle --filter=certificates --overwrite $DEST/openssl/ca-bundle.trust.crt
+	usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose server-auth $DEST/pem/tls-ca-bundle.pem
+	usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose email $DEST/pem/email-ca-bundle.pem
+	usr/bin/p11-kit extract --format=pem-bundle --filter=ca-anchors --overwrite --purpose code-signing $DEST/pem/objsign-ca-bundle.pem
+	usr/bin/p11-kit extract --format=java-cacerts --filter=ca-anchors --overwrite --purpose server-auth $DEST/java/cacerts
+
+	mkdir -p usr/ssl/certs
+	cp -f $DEST/pem/tls-ca-bundle.pem usr/ssl/certs/ca-bundle.crt
+	cp -f $DEST/pem/tls-ca-bundle.pem usr/ssl/cert.pem
+	cp -f $DEST/openssl/ca-bundle.trust.crt usr/ssl/certs/ca-bundle.trust.crt
+
+	#usr/bin/update-ca-trust >/dev/null 2>&1
 }
 
 post_upgrade() {
diff --git a/dash/PKGBUILD b/dash/PKGBUILD
index 51b8760f..ba5fc6eb 100644
--- a/dash/PKGBUILD
+++ b/dash/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=dash
 pkgver=0.5.7
-pkgrel=2
+pkgrel=3
 pkgdesc="A POSIX compliant shell that aims to be as small as possible"
 arch=('i686' 'x86_64')
 url="http://gondor.apana.org.au/~herbert/dash/"
diff --git a/dash/dash.install b/dash/dash.install
index 74e574fe..c52c168d 100644
--- a/dash/dash.install
+++ b/dash/dash.install
@@ -1,5 +1,5 @@
 post_install() {
-	bin/grep -q '/bin/dash' etc/shells || echo '/bin/dash' >> etc/shells
+	usr/bin/grep -q '/bin/dash' usr/etc/shells || echo '/bin/dash' >> usr/etc/shells
 }
 
 post_upgrade() {
@@ -7,5 +7,5 @@ post_upgrade() {
 }
 
 pre_remove() {
-	bin/sed -i '/^\/bin\/dash/d' etc/shells
+	usr/bin/sed -i '/^\/bin\/dash/d' usr/etc/shells
 }
diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD
index ec4bb8e3..cb450cca 100644
--- a/libxml2/PKGBUILD
+++ b/libxml2/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('libxml2' 'libxml2-devel' 'libxml2-python')
 pkgver=2.9.1
-pkgrel=3
+pkgrel=4
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
diff --git a/libxml2/libxml2-python.install b/libxml2/libxml2-python.install
index 0baef5af..aad6f96e 100644
--- a/libxml2/libxml2-python.install
+++ b/libxml2/libxml2-python.install
@@ -6,14 +6,14 @@ python_optimize() {
 
 	for pyd in "${@:-${PYTHON_SITELIB}}"
 	do
-		if [ ! -d ${D}${pyd} ]
+		if [ ! -d ${pyd} ]
 		then
 			echo "Error: directory ${pyd} does not exist"
 		fi
 
 		echo "Compiling ${pyd}..."
-		bin/python2 ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${D}${pyd}
-		bin/python2 -OO ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${D}${pyd}
+		usr/bin/python2 ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
+		usr/bin/python2 -OO ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
 	done
 }
 
diff --git a/libxml2/libxml2.install b/libxml2/libxml2.install
index 478e8730..2de9d52d 100644
--- a/libxml2/libxml2.install
+++ b/libxml2/libxml2.install
@@ -1,6 +1,6 @@
 post_install() {
-  if test ! -f etc/xml/catalog; then
-    bin/mkdir -p etc/xml
-    bin/xmlcatalog --noout --create etc/xml/catalog
+  if test ! -f usr/etc/xml/catalog; then
+    usr/bin/mkdir -p usr/etc/xml
+    usr/bin/xmlcatalog --noout --create usr/etc/xml/catalog
   fi
 }
diff --git a/texinfo/PKGBUILD b/texinfo/PKGBUILD
index a324230c..3821fbd1 100644
--- a/texinfo/PKGBUILD
+++ b/texinfo/PKGBUILD
@@ -2,12 +2,12 @@
 
 pkgname=texinfo
 pkgver=5.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/texinfo/"
 license=('GPL3')
-groups=('base-devel')
+groups=('base' 'base-devel')
 depends=('ncurses' 'findutils' 'gzip' 'perl' 'sh')
 install=texinfo.install
 source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}