--- ltsp-client-setup.orig	2010-03-12 17:36:53.000000000 +0100
+++ ltsp-client-setup	2010-04-23 15:01:32.000000000 +0200
@@ -91,7 +91,7 @@
 
 configure_console() {
     if [ -n "$CONSOLE_KEYMAP" ]; then
-        sed -i 's/keymap="us"/keymap="${CONSOLE_KEYMAP}"/' /etc/conf.d/keymaps
+        sed -i "s/keymap=\"us\"/keymap=\"${CONSOLE_KEYMAP}\"/" /etc/conf.d/keymaps
     fi
 }
 
@@ -121,11 +121,12 @@
 configure_syslog() {
     if [ -z "$SYSLOG" ] || [ "$SYSLOG" = "remote" ]; then
         SYSLOG_HOST=${SYSLOG_HOST:-"${SERVER}"}
-        cat <<EOF > /etc/syslog-ng/syslog-ng.conf
-source src { unix-stream("/dev/log"); internal(); };
-destination remote {tcp("$SYSLOG_HOST");};
-log {source(src);destination(remote);};
-
+        syslog_version=$(syslog-ng -V | head -n 1)
+        syslog_version=${syslog_version##* }
+        bzcat /usr/share/doc/syslog-ng-${syslog_version}/syslog-ng.conf.gentoo.3.0.bz2 > /etc/syslog-ng/syslog-ng.conf
+        cat <<EOF >> /etc/syslog-ng/syslog-ng.conf
+destination loghost { udp("${SYSLOG_HOST}" port(514)); };
+log { source(src); destination(loghost); };
 EOF
     fi
 }