diff --git a/nfs-utils/PKGBUILD b/nfs-utils/PKGBUILD
index 11c1551f8..735deb55b 100644
--- a/nfs-utils/PKGBUILD
+++ b/nfs-utils/PKGBUILD
@@ -60,7 +60,7 @@ build() {
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
               --enable-ipv6 --sysconfdir=/etc \
 	      --enable-libmount-mount --enable-mountconfig
-  
+
   make 
 }
 
diff --git a/openvpn/PKGBUILD b/openvpn/PKGBUILD
index 734594fc3..48656434a 100644
--- a/openvpn/PKGBUILD
+++ b/openvpn/PKGBUILD
@@ -1,23 +1,32 @@
+#
+# Core packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas[at]chakra-project[dot]org>
+
 pkgname=openvpn
-pkgver=2.1.4
-pkgrel=4
+pkgver=2.2.2
+pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
+arch=('x86_64')
 url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2')
+depends=('openssl' 'lzo2' 'iproute2')
 license=('custom')
 backup=(usr/share/openvpn/easy-rsa/vars
         usr/share/openvpn/easy-rsa/openssl.cnf
         etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
-	openvpn@.service)
-md5sums=('96a11868082685802489254f03ff3bde'
+source=("http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz"
+	'openvpn@.service')
+md5sums=('c5181e27b7945fa6276d21873329c5c7'
          '44047df812a3fcd57a7e36a61732a9b9')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
   # Build openvpn
-  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure --prefix=/usr --enable-password-save --mandir=/usr/share/man
+  CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\""
+     ./configure --prefix=/usr \
+        --enable-password-save \
+        --mandir=/usr/share/man \
+        --enable-iproute2
   make
 
   # Build plugins
diff --git a/python-m2crypto/PKGBUILD b/python-m2crypto/PKGBUILD
deleted file mode 100644
index 91302bd9e..000000000
--- a/python-m2crypto/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# Chakra Packages for Chakra, part of chakra-project.org
-#
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
-
-# Note: needs rebuild against 2.x python. 2.7.x would be fine and is not needed.
-
-pkgname=python-m2crypto
-pkgver=0.20.2
-pkgrel=4
-pkgdesc="A crypto and SSL toolkit for Python"
-arch=('i686' 'x86_64')
-url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
-license=('BSD')
-depends=('python' 'openssl')
-makedepends=('swig')
-source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz"
-	'openssl1.patch')
-md5sums=('6c24410410d6eb1920ea43f77a93613a'
-	'80a707ad6610f2871efdf40658e30364')
-
-build() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  patch -Np0 -i ${srcdir}/openssl1.patch || return 1
-  python setup.py build
-}
-
-package() {
-  cd "${srcdir}/M2Crypto-${pkgver}"
-  python setup.py install --root="${pkgdir}/"
-
-  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/python2-m2crypto/PKGBUILD b/python2-m2crypto/PKGBUILD
new file mode 100644
index 000000000..6fabf3d13
--- /dev/null
+++ b/python2-m2crypto/PKGBUILD
@@ -0,0 +1,33 @@
+#
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# maintainer abveritas[at]chakra-project[dot]org>
+
+pkgname=python2-m2crypto
+pkgver=0.21.1
+pkgrel=1
+pkgdesc="A crypto and SSL toolkit for Python"
+arch=('x86_64')
+url="http://wiki.osafoundation.org/bin/view/Projects/MeTooCrypto"
+license=('BSD')
+depends=('python2' 'openssl')
+provides=('python-m2crypto')
+replaces=('python-m2crypto')
+conflicts=('python-m2crypto')
+makedepends=('swig')
+source=("http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${pkgver}.tar.gz")
+md5sums=('f93d8462ff7646397a9f77a2fe602d17')
+
+build() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+   
+  python setup.py build
+}
+
+package() {
+  cd "${srcdir}/M2Crypto-${pkgver}"
+  
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+
+  install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/python-m2crypto/openssl1.patch b/python2-m2crypto/openssl1.patch
similarity index 100%
rename from python-m2crypto/openssl1.patch
rename to python2-m2crypto/openssl1.patch
diff --git a/python2/PKGBUILD b/python2/PKGBUILD
index dc75122ba..a89b7a048 100644
--- a/python2/PKGBUILD
+++ b/python2/PKGBUILD
@@ -1,15 +1,14 @@
 #
 # Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas[at]chakra-project[dot]org>
 
 pkgname=python2
 pkgver=2.7.3
-pkgrel=1
+pkgrel=2
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('PSF')
 url="http://www.python.org"
 depends=('db>=4.8' 'bzip2' 'gdbm' 'openssl' 'zlib' 'expat' 'sqlite3' 'libffi')
diff --git a/ruby/PKGBUILD b/ruby/PKGBUILD
index 23f54cead..a50b58703 100644
--- a/ruby/PKGBUILD
+++ b/ruby/PKGBUILD
@@ -5,18 +5,18 @@
 # maintainer : Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
 pkgname=('ruby' 'ruby-docs')
-pkgver=1.9.3_p194
-_pkgver=1.9.3-p194
-pkgrel=2
+pkgver=1.9.3_p327
+_pkgver=1.9.3-p327
+pkgrel=1
 pkgdesc="An object-oriented language for quick and easy programming"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.ruby-lang.org/en/"
 license=('custom')
 makedepends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'tk' 'libffi'
              'doxygen' 'graphviz' 'libyaml')
 options=('!emptydirs')
 source=("ftp://ftp.ruby-lang.org/pub/ruby/1.9/${pkgname}-${_pkgver}.tar.bz2")
-md5sums=('2278eff4cfed3cbc0653bc73085caa34')
+md5sums=('7d602aba93f31ceef32800999855fbca')
 
 build() {
   cd "${srcdir}/${pkgname}-${_pkgver}"
@@ -28,8 +28,7 @@ build() {
   make
 }
 
-package_ruby()
-{
+package_ruby() {
   depends=('gdbm' 'db' 'openssl' 'zlib' 'readline' 'libffi' 'libyaml')
   provides=('rubygems' 'rake')
   conflicts=('rubygems' 'rake')
@@ -40,13 +39,13 @@ package_ruby()
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
 
-package_ruby-docs()
-{
+package_ruby-docs() {
   pkgdesc="Documentation files for ruby"
-  #arch=('any')
+
   depends=('ruby')
 
-  cd "${srcdir}/${pkgname}-${_pkgver}"
+  cd "${srcdir}/ruby-${_pkgver}"
   make -j1 DESTDIR="${pkgdir}" install-doc install-capi
-  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/COPYING"
+  install -Dm644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE"
+  install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL"
 }
diff --git a/syslog-ng/PKGBUILD b/syslog-ng/PKGBUILD
index b8769a02a..f3f8974b2 100644
--- a/syslog-ng/PKGBUILD
+++ b/syslog-ng/PKGBUILD
@@ -5,14 +5,13 @@
 
 
 pkgname=syslog-ng
-pkgver=3.3.5
+pkgver=3.3.7
 pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
+arch=('x86_64')
 license=('GPL2')
-groups=('base')
 url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
+depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk' 'systemd')
 makedepends=('flex' 'pkg-config')
 optdepends=('logrotate: for rotating log files')
 provides=('logger')
@@ -22,13 +21,11 @@ backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
 source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
         'syslog-ng.conf'
         'syslog-ng.conf.d'
-        'syslog-ng.logrotate'
-        'syslog-ng.rc')
-sha1sums=('0c8b85079b60c68c4279bcd4124b1e3c6358407b'
+        'syslog-ng.logrotate')
+sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8'
           '98074e0facfc6ef036202662cc86d04b38a2c142'
           'eb2aa25737e0cb9453c7b058f0e2dcf16abf21cd'
-          '949128fe3d7f77a7aab99048061f885bc758000c'
-          '94af81a84e3add6653755122cdd5080694de059d')
+          '949128fe3d7f77a7aab99048061f885bc758000c')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -53,12 +50,5 @@ package() {
   install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
   install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
-  install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
   install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
-
-  # location of systemctl
-  sed -e 's@/bin/systemctl@/usr&@' \
-      -e '$aAlias=syslog.service' \
-      -e '/^ExecStartPre/d' \
-      -i "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
 }
diff --git a/syslog-ng/syslog-ng.rc b/syslog-ng/syslog-ng.rc
deleted file mode 100755
index d48b71ed1..000000000
--- a/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/syslog-ng
-
-checkconfig() {
-  if ! syslog-ng -s "${SYSLOG_NG_CHECKOPTS[@]}"; then
-    stat_fail
-    exit 1
-  fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
-  read -r PID < "$pidfile"
-  if [[ $PID && ! -d /proc/$PID ]]; then
-    # stale pidfile
-    unset PID
-    rm -f "$pidfile"
-  fi
-fi
-
-case $1 in
-  start)
-    stat_busy "Starting Syslog-NG"
-    checkconfig
-    if [[ -z $PID ]] && /usr/sbin/syslog-ng "${SYSLOG_NG_OPTS[@]}"; then
-      add_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    if [[ $PID ]] && kill $PID &>/dev/null; then
-      rm_daemon syslog-ng
-      stat_done
-    else
-      stat_fail
-      exit 1
-    fi
-    ;;
-  reload)
-    stat_busy "Reloading Syslog-NG configuration and re-opening log files"
-    if [[ -z $PID ]]; then
-      stat_fail
-    else
-      checkconfig
-      if kill -HUP $PID &>/dev/null; then
-        stat_done
-      else
-        stat_fail
-        exit 1
-      fi
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart|reload}"
-esac
diff --git a/vpnc/vpnc.rc b/vpnc/vpnc.rc
deleted file mode 100644
index 972ed3211..000000000
--- a/vpnc/vpnc.rc
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Connecting to VPN"
-    /usr/sbin/vpnc
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon vpnc
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Disconnecting from VPN"
-    /usr/sbin/vpnc-disconnect
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon vpnc
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0