diff --git a/nspr/PKGBUILD b/nspr/PKGBUILD
index 63d72d96f..4b68e2ec2 100644
--- a/nspr/PKGBUILD
+++ b/nspr/PKGBUILD
@@ -4,7 +4,7 @@
 # maintainer abveritas@chakra-project.org
 
 pkgname=nspr
-pkgver=4.9.4
+pkgver=4.9.5
 pkgrel=1
 pkgdesc="Netscape Portable Runtime"
 arch=('x86_64')
@@ -15,7 +15,7 @@ makedepends=('zip')
 options=(!emptydirs)
 source=("ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${pkgname}-${pkgver}.tar.gz"
         'nspr.pc.in')
-md5sums=('cf58772702b3abbdcff14e22014eeeaf'
+md5sums=('b6ccfa8fcbbeb17ebeb19a3edff612bd'
          'bce1611f3117b53fc904cab549c09967')
 
 build() {
diff --git a/nss/PKGBUILD b/nss/PKGBUILD
index b00739748..056dbf936 100644
--- a/nss/PKGBUILD
+++ b/nss/PKGBUILD
@@ -1,28 +1,24 @@
-#
-# Platform Packages for Chakra, part of chakra-project.org
-#
-# maintainer abveritas@chakra-project.org
+# Maintainer: abveritas@chakra-project.org
+# Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=nss
-pkgver=3.14
+pkgver=3.14.3
 pkgrel=1
 pkgdesc="Mozilla Network Security Services"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.mozilla.org/projects/security/pki/nss/"
 license=('MPL' 'GPL')
-_nsprver=4.9.4
-depends=("nspr>=${_nsprver}" 'sqlite3>=3.6.17' 'zlib')
+_nsprver=4.9.5
+depends=("nspr>=${_nsprver}" 'sqlite3' 'zlib')
 makedepends=('perl')
-replaces=('nss-nspr')
 options=('!strip')
-
 source=("ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${pkgname}-${pkgver}.tar.gz"
         'nss.pc.in'
         'nss-config.in'
         'add_spi+cacert_ca_certs.patch'
         'ssl-renegotiate-transitional.patch')
 
-md5sums=('3918d5f9eb2996271cf62d52f084fd45'
+md5sums=('b326c2be8df277f62fb9c65fb3428148'
          'c547b030c57fe1ed8b77c73bf52b3ded'
          '46bee81908f1e5b26d6a7a2e14c64d9f'
          'effe53b5de35e2efecef9f2c0893d54f'
@@ -35,8 +31,8 @@ build() {
   # Adds transitional SSL renegotiate support - patch from Debian
   patch -p2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
 
-  cd security/nss/lib/ckfw/builtins
-  make generate
+  #cd security/nss/lib/ckfw/builtins
+  #make generate
 
   cd "${srcdir}/${pkgname}-${pkgver}"
   unset CFLAGS
@@ -69,7 +65,7 @@ package() {
           -e "s,%prefix%,/usr,g" \
         -e "s,%exec_prefix%,/usr/bin,g" \
         -e "s,%includedir%,/usr/include/nss,g" \
-        -e "s,%NSPR_VERSION%,${pkgver},g" \
+        -e "s,%NSPR_VERSION%,${_nsprver},g" \
         -e "s,%NSS_VERSION%,${pkgver},g" > \
       "${pkgdir}/usr/lib/pkgconfig/nss.pc"
   ln -sf nss.pc "${pkgdir}/usr/lib/pkgconfig/mozilla-nss.pc"
diff --git a/portaudio-svn/PKGBUILD b/portaudio-svn/PKGBUILD
index 70dca4603..23a8e3e52 100644
--- a/portaudio-svn/PKGBUILD
+++ b/portaudio-svn/PKGBUILD
@@ -1,15 +1,11 @@
-#
-# Platform Packages for Chakra, part of chakra-project.org
-#
+# Maintainer: abveritas@chakra-project.org
 
-# include global config
-source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=portaudio-svn
 pkgver=1870
 pkgrel=1
 pkgdesc="PortAudio is a free, cross platform, open-source, audio I/O library."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.portaudio.com"
 license="custom"
 depends=('jack')