diff --git a/debian/changelog b/debian/changelog
index 7522319..1e9c8ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+pcsc-lite (1.6.0-2) experimental; urgency=low
+
+  * install an /etc/init.d/pcscd file again but with the daemon disabled.
+    This should ease upgrades and allow users to still start the daemon on
+    startup if needed.
+
+ -- Ludovic Rousseau <rousseau@debian.org>  Fri, 14 May 2010 17:30:19 +0200
+
 pcsc-lite (1.6.0-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/pcscd.init b/debian/pcscd.init
new file mode 100644
index 0000000..9ef45f0
--- /dev/null
+++ b/debian/pcscd.init
@@ -0,0 +1,161 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: pcscd
+# Required-Start:    $local_fs $remote_fs $syslog
+# Required-Stop:     $local_fs $remote_fs $syslog
+# Should-Start:      udev hal
+# Should-Stop:       udev hal
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: Daemon to access a smart card using PC/SC
+# Description:       The PC/SC daemon is used to dynamically
+#                    allocate/deallocate reader drivers at runtime and manage
+#                    connections to the readers.
+### END INIT INFO
+
+# Authors: 
+#   Carlos Prados Bocos <cprados@debian.org>
+#   Ludovic Rousseau <rousseau@debian.org>
+
+# Do NOT "set -e"
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC="PCSC Lite resource manager"
+NAME=pcscd
+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"
+
+# DO NOT start the daemon on startup
+# comment the line to have the same behavior as in version < 1.6.0
+exit 0
+
+# Exit if the package is not installed
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] && . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (>= 3.0-6) to ensure that this file is present.
+. /lib/lsb/init-functions
+
+# get LANG variable (code from /etc/init.d/keymap.sh)
+ENV_FILE="none"
+[ -r /etc/environment ] && ENV_FILE="/etc/environment"
+[ -r /etc/default/locale ] && ENV_FILE="/etc/default/locale"
+
+value=$(egrep "^[^#]*LANG=" $ENV_FILE | tail -n1 | cut -d= -f2)
+eval LANG=$value
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+	# Return
+	#   0 if daemon has been started
+	#   1 if daemon was already running
+	#   2 if daemon could not be started
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \
+		|| return 1
+	start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \
+		$DAEMON_ARGS \
+		|| return 2
+	# Add code here, if necessary, that waits for the process to be ready
+	# to handle requests from services started subsequently which depend
+	# on this one.  As a last resort, sleep for some time.
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+	# Return
+	#   0 if daemon has been stopped
+	#   1 if daemon was already stopped
+	#   2 if daemon could not be stopped
+	#   other if a failure occurred
+	start-stop-daemon --stop --quiet --retry=3 --pidfile $PIDFILE --name $NAME
+	RETVAL="$?"
+	[ "$RETVAL" = 2 ] && return 2
+}
+
+#
+# Function that sends a SIGHUP to the daemon/service
+#
+do_reload() {
+	#
+	# If the daemon can reload its configuration without
+	# restarting (for example, when it is sent a SIGHUP),
+	# then implement that here.
+	#
+	start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
+	return 0
+}
+
+case "$1" in
+  start)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
+	do_start
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  stop)
+	[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
+	do_stop
+	case "$?" in
+		0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
+		2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
+	esac
+	;;
+  #reload|force-reload)
+	#
+	# If do_reload() is not implemented then leave this commented out
+	# and leave 'force-reload' as an alias for 'restart'.
+	#
+	#log_daemon_msg "Reloading $DESC" "$NAME"
+	#do_reload
+	#log_end_msg $?
+	#;;
+  restart|force-reload)
+	#
+	# If the "reload" option is implemented then remove the
+	# 'force-reload' alias
+	#
+	log_daemon_msg "Restarting $DESC" "$NAME"
+	do_stop
+	case "$?" in
+	  0|1)
+		do_start
+		case "$?" in
+			0) log_end_msg 0 ;;
+			1) log_end_msg 1 ;; # Old process is still running
+			*) log_end_msg 1 ;; # Failed to start
+		esac
+		;;
+	  *)
+	  	# Failed to stop
+		log_end_msg 1
+		;;
+	esac
+	;;
+  *)
+	#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2
+	exit 3
+	;;
+esac
+
+:
diff --git a/debian/rules b/debian/rules
index 65f0eae..0040dee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,6 +98,8 @@ binary-arch: build install
 	dh_install --sourcedir=debian/tmp
 	dh_installdocs
 	dh_installexamples
+	# use 50 to start _after_ usbmgr with level 45 (see #146151)
+	dh_installinit --update-rcd-params="defaults 50"
 	dh_installman
 	dh_lintian
 	dh_installchangelogs ChangeLog