diff -uNr wvstreams.orig/debian/patches/00_lliurex_uniconfd_default.diff wvstreams/debian/patches/00_lliurex_uniconfd_default.diff
--- wvstreams.orig/debian/patches/00_lliurex_uniconfd_default.diff	2010-05-07 14:24:36.219473000 +0200
+++ wvstreams/debian/patches/00_lliurex_uniconfd_default.diff	2010-05-11 15:49:39.099654619 +0200
@@ -1,21 +0,0 @@
-diff -uNr wvstreams.orig/debian/uniconfd.default wvstreams/debian/uniconfd.default
---- wvstreams.orig/debian/uniconfd.default	2010-05-07 10:00:41.000000000 +0200
-+++ wvstreams/debian/uniconfd.default	2010-05-07 14:40:43.921037538 +0200
-@@ -1,10 +1,14 @@
- # Default settings for Uniconf. This file is sourced by /bin/sh from
- # /etc/init.d/uniconfd.
- 
-+UNICONFD_PORT=4111
- # These are the options that we pass to the $UNICONFD.
--# Don't run TCP or SSL, but run a Unix socket at /var/lib/uniconf/control
--UNICONFD_OPTS="-d -p 0 -s 0 -u /var/lib/uniconf/control"
-+
-+UNICONFD_OPTS="-dl tcp:$UNICONFD_PORT"
- 
- # And these are the Uniconf mounts.  By default, we set up a temp: generator
- # at the root.
--UNICONFD_MOUNTS="/=temp:"
-+UNICONFD_CFG="/etc/uniconfd.d"
-+UNICONFD_MOUNTS="/tmp=temp:"
-+[ ! -d "$UNICONFD_CFG" ] || UNICONFD_MOUNTS="$UNICONFD_MOUNTS $(find "$UNICONFD_CFG" -xtype f -exec cat {} \; |sed -e "/^#/d;/^[[:blank:]]*$/d;" |tr "\n" " ")"
-+
diff -uNr wvstreams.orig/debian/uniconfd.default wvstreams/debian/uniconfd.default
--- wvstreams.orig/debian/uniconfd.default	2010-05-11 15:43:06.711656292 +0200
+++ wvstreams/debian/uniconfd.default	2010-05-11 15:49:02.335649710 +0200
@@ -1,10 +1,16 @@
 # Default settings for Uniconf. This file is sourced by /bin/sh from
 # /etc/init.d/uniconfd.
 
+UNICONFD_PORT=4111
 # These are the options that we pass to the $UNICONFD.
-# Don't run TCP or SSL, but run a Unix socket at /var/lib/uniconf/control
-UNICONFD_OPTS="-d -p 0 -s 0 -u /var/lib/uniconf/control"
+
+UNICONFD_CFG="/etc/uniconfd"
+UNICONFD_CFG_MOUNTS="/etc/uniconfd/mounts.d"
+UNICONFD_CFG_TRIGGERS="/etc/uniconfd/triggers.d"
+UNICONFD_OPTS="-dl tcp:$UNICONFD_PORT -e $UNICONFD_CFG_TRIGGERS"
 
 # And these are the Uniconf mounts.  By default, we set up a temp: generator
 # at the root.
-UNICONFD_MOUNTS="/=temp:"
+UNICONFD_MOUNTS="/tmp=temp:"
+[ ! -d "$UNICONFD_CFG_MOUNTS" ] || UNICONFD_MOUNTS="$UNICONFD_MOUNTS $(find "$UNICONFD_CFG_MOUNTS" -xtype f -exec cat {} \; |sed -e "/^#/d;/^[[:blank:]]*$/d;" |tr "\n" " ")"
+