diff --git a/THANKS b/THANKS
index 8e4c9129a..10e8631aa 100644
--- a/THANKS
+++ b/THANKS
@@ -92,6 +92,7 @@ Geoff Keating		   geoffk at ozemail.com.au
 Georg Schwarz              georg.schwarz at iname.com
 Giampaolo Tomassoni        g.tomassoni at libero.it
 Gilbert Fernandes          gilbert_fernandes at hotmail.com
+Grant Olson                kgo at grant-olson net
 Greg Louis		   glouis at dynamicro.on.ca
 Greg Troxel		   gdt at ir.bbn.com
 Gregory Steuck		   steuck at iname.com
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 419f9d44d..5fb59095f 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,10 @@
+2011-01-25  NIIBE Yutaka <gniibe@fsij.org>,
+	    Grant Olson <kgo@grant-olson.net>  (wk)
+
+	* command.c (do_reset, get_reader_slot)
+	(update_reader_status_file): Fix handling of the VALID flag for
+	unplugged readers. 
+
 2010-03-17  Werner Koch  <wk@g10code.com>
 
 	* command.c (open_card): Return GPG_ERR_NOT_OPERATIONAL if no
diff --git a/scd/command.c b/scd/command.c
index e2cd1f514..28bc4df41 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -309,7 +309,7 @@ do_reset (ctrl_t ctrl, int send_reset)
     {
       if (apdu_reset (slot)) 
         {
-          slot_table[slot].reset_failed = 1;
+          slot_table[slot].valid = 0;
         }
       application_notify_card_reset (slot);
     }
@@ -401,6 +401,14 @@ get_reader_slot (void)
     {
       int no_service_flag;
       ss->slot = apdu_open_reader (opt.reader_port, &no_service_flag);
+
+      /* If we still don't have a slot, we have no readers.
+	 Invalidate for now until a reader is attached. */
+      if(ss->slot == -1)
+	{
+	  ss->valid = 0;
+	}
+
       if (no_service_flag)
         {
           log_info ("no card services - disabling scdaemon\n");
@@ -2192,6 +2200,8 @@ update_reader_status_file (int set_card_removed_flag)
       if (sw_apdu == SW_HOST_NO_READER)
         {
           /* Most likely the _reader_ has been unplugged.  */
+	  apdu_close_reader (ss->slot);
+	  ss->valid = 0;
           status = 0;
           changed = ss->changed;
         }