diff --git a/pcsc-lite/trunk/trunk/debian/changelog b/pcsc-lite/trunk/trunk/debian/changelog
index cca5123..9e24a3a 100644
--- a/pcsc-lite/trunk/trunk/debian/changelog
+++ b/pcsc-lite/trunk/trunk/debian/changelog
@@ -1,3 +1,10 @@
+pcsc-lite (1.4.99-2) unstable; urgency=low
+
+  * debian/pcscd.init: include /etc/default/pcscd if present and document its
+    usage
+
+ -- Ludovic Rousseau <rousseau@debian.org>  Sun, 20 Jan 2008 15:21:12 +0100
+
 pcsc-lite (1.4.99-1) unstable; urgency=low
 
   * New upstream release
diff --git a/pcsc-lite/trunk/trunk/debian/pcscd.init b/pcsc-lite/trunk/trunk/debian/pcscd.init
index 0662d82..6a55987 100644
--- a/pcsc-lite/trunk/trunk/debian/pcscd.init
+++ b/pcsc-lite/trunk/trunk/debian/pcscd.init
@@ -27,6 +27,10 @@ DAEMON=/usr/sbin/$NAME
 PIDFILE=/var/run/pcscd/$NAME.pid
 SCRIPTNAME=/etc/init.d/$NAME
 
+# if you need to pass arguments to pcscd you should edit the file
+# /etc/default/pcscd and add a line 
+# DAEMON_ARGS="--your-option"
+
 # Gracefully exit if the package has been removed (but not purged).
 [ -x "$DAEMON" ] || exit 0
 
@@ -36,6 +40,11 @@ SCRIPTNAME=/etc/init.d/$NAME
 # Define LSB log_* functions.
 . /lib/lsb/init-functions
 
+# Include pcscd defaults if available
+if [ -f /etc/default/pcscd ] ; then
+	. /etc/default/pcscd
+fi
+
 # get LANG variable (code from /etc/init.d/keymap.sh)
 ENV_FILE="none"
 [ -r /etc/environment ] && ENV_FILE="/etc/environment"