diff --git a/package/public/avahi/avahi.desc b/package/public/avahi/avahi.desc
index 118433374..486ef45df 100644
--- a/package/public/avahi/avahi.desc
+++ b/package/public/avahi/avahi.desc
@@ -43,8 +43,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 0.6.14
+[V] 0.6.21
 [P] X -----5---9 220.300
 
-[D] 2745187061 avahi-0.6.14.tar.gz http://avahi.org/download/
+[D] 0 avahi-0.6.21.tar.gz http://avahi.org/download/
 
diff --git a/package/public/docbookx/docbookx.conf b/package/public/docbookx/docbookx.conf
new file mode 100644
index 000000000..f8f1eba33
--- /dev/null
+++ b/package/public/docbookx/docbookx.conf
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+hook_add postmake 5 "ln -svf xsl-stylesheets-$docbook_xsl_version \
+	-T $datadir/xml/docbook/xsl-stylesheets ; \
+	ln -svf xml-dtd-$docbook_xml_version \
+	-T $datadir/xml/docbook/xml-dtd"
diff --git a/package/public/docbookx/docbookx.desc b/package/public/docbookx/docbookx.desc
index afea8082c..8497ee0ca 100644
--- a/package/public/docbookx/docbookx.desc
+++ b/package/public/docbookx/docbookx.desc
@@ -52,6 +52,8 @@
 [V] 412
 [P] X --?--5---9 159.400
 
+[O] docbook_xsl_version=1.48
+[O] docbook_xml_version=4.1.2-9
 [D] 2863468380 docbookx412.tgz http://scrollkeeper.sourceforge.net/data/
 [D] 4050834588 docbook-xsl-1.48.tgz http://scrollkeeper.sourceforge.net/data/
 
diff --git a/package/public/intltool/intltool.desc b/package/public/intltool/intltool.desc
index 68bb379d4..8f3a8901c 100644
--- a/package/public/intltool/intltool.desc
+++ b/package/public/intltool/intltool.desc
@@ -36,7 +36,7 @@
 
 [L] GPL
 [S] Beta
-[V] 0.35.5
+[V] 0.36.2
 [P] X --?--5---9 169.600
 
-[D] 163640479 intltool-0.35.5.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/intltool/0.35/
+[D] 0 intltool-0.36.2.tar.bz2 ftp://ftp.gnome.org/pub/GNOME/sources/intltool/0.36/
diff --git a/package/public/nspr/nspr.conf b/package/public/nspr/nspr.conf
index c10b428d8..3ba1027ba 100644
--- a/package/public/nspr/nspr.conf
+++ b/package/public/nspr/nspr.conf
@@ -1,3 +1,5 @@
+#!/bin/bash
+
 srcdir="nss-$ver/mozilla/security/nss"
 
 var_append makeopt " " "nss_build_all"
diff --git a/package/public/nspr/nspr.desc b/package/public/nspr/nspr.desc
index 80b0a124c..2cd0cb6f5 100644
--- a/package/public/nspr/nspr.desc
+++ b/package/public/nspr/nspr.desc
@@ -44,9 +44,9 @@
 
 [L] MPL
 [S] Stable
-[V] 3.11.3
-[O] nspr_ver=4.6.3
+[V] 3.11.7
+[O] nspr_ver=4.6.7
 [P] X -----5---9 182.200
 
-[D] 1610069464 nss-3.11.3.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_3_RTM/src/
-[D] 2186196340 nspr-4.6.3.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.3/src/
+[D] 3797523332 nss-3.11.7.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_11_7_RTM/src/
+[D] 1801759831 nspr-4.6.7.tar.gz ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.6.7/src/
diff --git a/package/public/opal/opal.desc b/package/public/opal/opal.desc
index 3a124b7be..b5dd96c61 100644
--- a/package/public/opal/opal.desc
+++ b/package/public/opal/opal.desc
@@ -55,8 +55,8 @@
 
 [L] MPL
 [S] Stable
-[V] 2.2.3
+[V] 2.2.11
 [P] X -----5---9 215.500
 
-[D] 3793636633 opal-v2_2_3-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/openh323/
+[D] 2029668386 opal-2.2.11.tar.gz http://www.ekiga.org/admin/downloads/latest/sources/sources/
 
diff --git a/package/public/pwlib/pwlib.conf b/package/public/pwlib/pwlib.conf
index bbbd7f4c7..3ccc7d065 100644
--- a/package/public/pwlib/pwlib.conf
+++ b/package/public/pwlib/pwlib.conf
@@ -24,21 +24,19 @@
 # var_append makeopt " " "opt"
 # var_append makeinstopt " " "PREFIX=$root/$prefix"
 
-pwlib_preconf() {
-        if pkginstalled openldap; then
-            var_append configprefix ' ' \
-                   'CPPFLAGS="-I${pkg_openldap_prefix}/include"'
-            var_append configprefix ' ' \
-                   'LDFLAGS="-L${pkg_openldap_prefix}/lib"'
-            var_append confopt ' ' '--enable-openldap' 
-        fi
-#        var_append confopt ' ' '--enable-plugins'
-}
+var_append extraconfopt ' ' '--enable-plugins --disable-oss --enable-v4l2'
 
-pwlib_premake() {
-        pkginstalled openldap && var_append makeopt ' ' 'CFLAGS="-I${pkg_openldap_prefix}/include"'
-}
+if pkginstalled openldap; then
+	var_append configprefix ' ' \
+		'CPPFLAGS="-I${pkg_openldap_prefix}/include"'
+	var_append configprefix ' ' \
+		'LDFLAGS="-L${pkg_openldap_prefix}/lib"'
+     var_append extraconfopt ' ' '--enable-openldap'
+fi
+
+pkginstalled openldap && var_append makeopt ' ' 'CFLAGS="-I${pkg_openldap_prefix}/include"'
 
+hook_add inmake 3 pwlib_inmake
 pwlib_inmake() {
 	rm -rf $libdir/libpt.so $root/$prefix/include/pt{,c}lib
 	
@@ -46,9 +44,5 @@ pwlib_inmake() {
 	cp -a version.h $datadir/pwlib
 }
 
-hook_add preconf 3 pwlib_preconf
-hook_add premake 3 pwlib_premake
-hook_add inmake 3 pwlib_inmake
-
 var_remove GCC3_WRAPPER_INSERT " " "-fstack-protector"
 
diff --git a/package/public/pwlib/pwlib.desc b/package/public/pwlib/pwlib.desc
index 9ac4540f6..22b8b29b8 100644
--- a/package/public/pwlib/pwlib.desc
+++ b/package/public/pwlib/pwlib.desc
@@ -55,8 +55,8 @@
 
 [L] MPL
 [S] Stable
-[V] 1.10.2
+[V] 1.10.10
 [P] X --?--5---9 214.700
 
-[D] 4192333637 pwlib-v1_10_2-src.tar.gz http://mesh.dl.sourceforge.net/openh323/
+[D] 1298413494 pwlib-1.10.10.tar.gz http://www.ekiga.org/admin/downloads/latest/sources/sources/
 
diff --git a/package/public/pycairo/pycairo.desc b/package/public/pycairo/pycairo.desc
index a543c3367..ea9604526 100644
--- a/package/public/pycairo/pycairo.desc
+++ b/package/public/pycairo/pycairo.desc
@@ -38,8 +38,8 @@
 
 [L] LGPL
 [S] Stable
-[V] 1.2.2
+[V] 1.4.0
 [P] X -----5---9 170.600
 
-[D] 2393648072 pycairo-1.2.2.tar.gz http://cairographics.org/releases/
+[D] 476282242 pycairo-1.4.0.tar.gz http://cairographics.org/releases/