diff --git a/acpid/PKGBUILD b/acpid/PKGBUILD
index ce6610d51..b6ba2f66f 100644
--- a/acpid/PKGBUILD
+++ b/acpid/PKGBUILD
@@ -1,7 +1,5 @@
-# Maintainer: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail.com>
-
 pkgname=acpid
-pkgver=2.0.23
+pkgver=2.0.25
 pkgrel=1
 pkgdesc="A daemon for delivering ACPI power management events with netlink support."
 arch=('x86_64')
@@ -20,7 +18,7 @@ source=("http://sourceforge.net/projects/acpid2/files/${pkgname}-${pkgver}.tar.x
          'acpid.socket'
          'acpid.service')
 categories=('system')
-md5sums=('d7bcdcdefcd53b03730e50ba842554ea'
+md5sums=('69bb0cc4a0a89eb2dfecc4851087f568'
          'd9ca7f71f520238a0448fab105a23fe9'
          '91fdb3709c878eed757d192a420251a1'
          '2d37b98d6e74bab815604b8b48c6cfd4'
diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD
index 3a77f7d57..36bdcb532 100644
--- a/calibre/PKGBUILD
+++ b/calibre/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=calibre
-pkgver=2.35.0
+pkgver=2.36.0
 pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
@@ -18,7 +18,7 @@ optdepends=('ipython2: to use calibre-debug'
 screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAAAEc/M34I4uY9UUY/s800/gui.jpeg')
 install=${pkgname}.install
 source=("http://download.calibre-ebook.com/${pkgver}/${pkgname}-${pkgver}.tar.xz")
-sha512sums=('a693c23e93ad1086fe70b0cc7dcf43b1a9c004f045a3c2fac42f6a4b9f231d4f1e7b55c8bae133ac48389d4e233e245deb958365e9c0283cd8668f0f5a2326a2')
+sha512sums=('4e3734e154036d33281e3f769c56b2a6ffab896a069de4dd1b05435458e8158a69e6692c82b146b943a7bc13527e2cf2a15ffc2ad68beb3a0102ad382f1c8565')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/dpic/PKGBUILD b/dpic/PKGBUILD
index 7d4c2104a..8aec17b91 100644
--- a/dpic/PKGBUILD
+++ b/dpic/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=dpic
-pkgver=2015.06.29
+pkgver=2015.08.13
 pkgrel=1
 pkgdesc="A pic language interpreter"
 arch=('x86_64')
@@ -8,7 +8,7 @@ license=('BSD')
 makedepends=('gcc')
 options=('!docs')
 source=("https://ece.uwaterloo.ca/~aplevich/dpic/dpic.tar.gz")
-sha512sums=('7e7ba112efa282406e57e3cacd52ed6fdef21d330b4a0cb87ecf9b24e927406b1e218063afe2b4b4db02816a985ef21c7d696e6ca91d2df822ccfe83624503c7')
+sha512sums=('9796a0706798e26f7e936e62482418e1b7fbc1579d66b0cf097ad26d2e8bb6d3ccbd1aec3cce3152d64127dbb97453864946c9a027e8e5855e9988f1534f815d')
 
 build() {
   cd $srcdir/$pkgname
diff --git a/lighttpd/PKGBUILD b/lighttpd/PKGBUILD
index 6eb69b955..681a17cb1 100644
--- a/lighttpd/PKGBUILD
+++ b/lighttpd/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=lighttpd
-pkgver=1.4.36
-pkgrel=2
+pkgver=1.4.37
+pkgrel=1
 pkgdesc='A secure, fast, compliant and very flexible web-server.'
 license=('custom')
 arch=('x86_64')
@@ -20,7 +20,7 @@ source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}
         'lighttpd.service'
         'lighttpd.logrotate.d' 
         'lighttpd.conf')
-sha512sums=('ecb88874dd81b5a469d94b8a1b03823b5b12cf49264d77f0d3b71cd4b537ffdd03595a3a471186c36cd9cfaebc5cff5c5f4037c2d8aeb83012ca224651f8a359'
+sha512sums=('66895bef05cc0cefb8807a7a753d6bd5fba0486c2187334f223a5b8431f789154a42ea3927e8a2a5ad09796433a47dd4ba8851400b9d76743202d42181a98bff'
             '0079d6fd80ca42fa5384838b3df68d25000fb7a5a92ea9fb02f6a18cdfb85b23279c78b881e21270e7e450ee3ae28ea839932f3268b826b52478079e510ecd33'
             'e9cb6f83e19366f8243a1ac1962d957f11801dbf20b2ebdaecd96d8422f794fd9061725dab648a6fd1bc7b74f59601340970f05ab4288e5c9ff92b065fbf1bf4'
             '6ad0213cb50e9325b0cbf8a58365387868f9798c775ce3b68b032fc4046ea637eb31f1fde38af7bb5efc5aac6a6e3443a8a620fd1c55f3beeece35300dec0fbd'
diff --git a/nodejs/PKGBUILD b/nodejs/PKGBUILD
index 6c0391a89..e9fb7c72c 100644
--- a/nodejs/PKGBUILD
+++ b/nodejs/PKGBUILD
@@ -1,30 +1,20 @@
 pkgname=nodejs
 pkgver=0.12.7
-_npmver=2.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Evented I/O for V8 javascript'
 arch=('x86_64')
 url='http://nodejs.org/'
 license=('MIT')
-depends=('openssl' 'zlib')
-provides=('nodejs-node-gyp' 'npm')
-makedepends=('python2' 'git' 'procps-ng')
-optdepends=('python2: for node-gyp')
+depends=('openssl' 'zlib' 'icu')
+makedepends=('python2' 'procps-ng')
+optdepends=('npm: nodejs package manager')
 checkdepends=('curl')
-options=('!emptydirs')
-source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz"
-        git+https://github.com/npm/npm.git#tag=v$_npmver)
-sha512sums=('0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606'
-            'SKIP')
+source=("http://nodejs.org/dist/v$pkgver/node-v$pkgver.tar.gz")
+sha512sums=('0c9cb7542530463e7703435c8d819949785c1c6497c6d98f9854ca615fe33a62f451833e856f0159b836a698b4dee5d165fa505bad5d474f664e1533090d8606')
 
 prepare() {
   cd node-v$pkgver
 
-  # We need newer version of npm to fix bugs
- # rm -r deps/npm
- # ln -s "$srcdir/npm" deps
- # rm -r "$srcdir/npm/.git"
-
   msg 'Fixing for python2 name'
   find -type f -exec sed \
     -e 's_^#!/usr/bin/env python$_&2_' \
@@ -40,15 +30,12 @@ build() {
   export PYTHON=python2
   ./configure \
     --prefix=/usr \
+    --with-intl=system-icu \
+    --without-npm \
     --shared-openssl \
     --shared-zlib
 
   make
-
-  cd ../npm
-  ../node-v$pkgver/node cli.js install ronn marked
-  PATH="$srcdir/node-v$pkgver:$PATH" make
-  ../node-v$pkgver/node cli.js uninstall ronn marked marked-man
 }
 
 check() {
@@ -68,14 +55,4 @@ package() {
 
   install -D -m644 LICENSE \
     "$pkgdir"/usr/share/licenses/nodejs/LICENSE
-
-  install -d "$pkgdir"/usr/share/man/{man1,man3,man5,man7}
-  for _dir in man1 man3 man5 man7; do
-    cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
-    for _file in *; do
-      ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
-    done
-  done
-
-  ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
 }
diff --git a/npm/PKGBUILD b/npm/PKGBUILD
new file mode 100644
index 000000000..9b4f44ac8
--- /dev/null
+++ b/npm/PKGBUILD
@@ -0,0 +1,47 @@
+# Contribution from Arch:
+# Maintainer: Felix Yan <felixonmars@archlinux.org>
+
+pkgname=npm
+pkgver=2.14.1
+pkgrel=1
+pkgdesc='A package manager for javascript'
+arch=('any')
+url='https://www.npmjs.com/'
+license=('custom:Artistic')
+depends=('nodejs')
+provides=('nodejs-node-gyp')
+makedepends=('procps-ng')
+optdepends=('python2: for node-gyp')
+options=('!emptydirs')
+source=("https://github.com/${pkgname}/${pkgname}/archive/v${pkgver}.tar.gz")
+md5sums=('7fecf045bf75c7d30a18d6fbc0dd6946')
+
+build() {
+  cd ${pkgname}-${pkgver}
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make NPMOPTS="--prefix=\"$pkgdir/usr\"" install
+
+  # Why 777? :/
+  chmod -R u=rwX,go=rX "$pkgdir"
+  
+  # Fix files owned by nobody:
+  chown -R root "$pkgdir/usr/lib/node_modules" 
+
+  # Fix wrong symlinks
+  for _dir in man1 man3 man5 man7; do
+    rm -f "$pkgdir"/usr/share/man/$_dir/*
+    cd "$pkgdir"/usr/lib/node_modules/npm/man/$_dir
+    for _file in *; do
+      ln -s /usr/lib/node_modules/npm/man/$_dir/$_file "$pkgdir"/usr/share/man/$_dir/
+    done
+  done
+  
+  # Make symlink for node-gyp
+  ln -s /usr/lib/node_modules/npm/node_modules/node-gyp/bin/node-gyp.js "$pkgdir"/usr/bin/node-gyp
+  
+  install -Dm644 "$srcdir/${pkgname}-${pkgver}/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}