diff --git a/NEWS b/NEWS
index 64e9bbd97..c5ca8d74e 100644
--- a/NEWS
+++ b/NEWS
@@ -10,7 +10,7 @@ Noteworthy changes in version 2.0.2 (2007-01-31)
 
  * Using a PIN pad does now also work for the signing key.
 
- * A warning is displayed bu gpg-agent if a new passphrase is too
+ * A warning is displayed by gpg-agent if a new passphrase is too
    short.  New option --min-passphrase-len defaults to 8.
 
  * The status code BEGIN_SIGNING now shows the used hash algorithms.
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 96dd2f66a..c7a86d22e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-18  Werner Koch  <wk@g10code.com>
+
+	* gpg.texi (GPG Esoteric Options): No card reader options for gpg2. 
+
 2007-02-14  Werner Koch  <wk@g10code.com>
 
 	* gpg-agent.texi (Agent Options): Doc --pinentry-touch-file.
diff --git a/doc/gpg.texi b/doc/gpg.texi
index f5cc84e7e..330be40cf 100644
--- a/doc/gpg.texi
+++ b/doc/gpg.texi
@@ -1076,18 +1076,23 @@ not used).
 @include opt-homedir.texi
 
 
+@ifset gpgone
 @item --pcsc-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default is
 `libpcsclite.so.1' for GLIBC based systems,
 `/System/Library/Frameworks/PCSC.framework/PCSC' for MAC OS X,
 `winscard.dll' for Windows and `libpcsclite.so' for other systems.
+@end ifset
 
+@ifset gpgone
 @item --disable-ccid
 Disable the integrated support for CCID compliant readers. This
 allows to fall back to one of the other drivers even if the internal
 CCID driver can handle the reader. Note, that CCID support is only
 available if libusb was available at build time.
+@end ifset
 
+@ifset gpgone
 @item --reader-port @code{number_or_string}
 This option may be used to specify the port of the card terminal. A
 value of 0 refers to the first serial device; add 32768 to access USB
@@ -1095,6 +1100,7 @@ devices. The default is 32768 (first USB device). PC/SC or CCID
 readers might need a string here; run the program in verbose mode to get
 a list of available readers. The default is then the first reader
 found.
+@end ifset
 
 @item --display-charset @code{name}
 Set the name of the native character set. This is used to convert
@@ -2451,10 +2457,12 @@ Display the keyring name at the head of key listings to show which
 keyring a given key resides on. This option is deprecated: use
 @option{--list-options [no-]show-keyring} instead.
 
+@ifset gpgone
 @item --ctapi-driver @code{file}
 Use @code{file} to access the smartcard reader. The current default
 is `libtowitoko.so'. Note that the use of this interface is
 deprecated; it may be removed in future releases.
+@end ifset
 
 @item --always-trust
 Identical to @option{--trust-model always}. This option is deprecated.
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 9c6900117..38ef4f234 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-18  Werner Koch  <wk@g10code.com>
+
+	* scdaemon.c (DEFAULT_PCSC_DRIVER): Add a default for OS X.
+
 2007-01-25  Werner Koch  <wk@g10code.com>
 
 	* Makefile.am (scdaemon_LDADD): Added LIBICONV.  Noted by Billy
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index 6993b75e6..19c656202 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -139,9 +139,11 @@ static ARGPARSE_OPTS opts[] = {
 };
 
 
-/* The card dirver we use by default for PC/SC.  */
+/* The card driver we use by default for PC/SC.  */
 #if defined(HAVE_W32_SYSTEM) || defined(__CYGWIN__)
 #define DEFAULT_PCSC_DRIVER "winscard.dll"
+#elif defined(__APPLE__)
+#define DEFAULT_PCSC_DRIVER "/System/Library/Frameworks/PCSC.framework/PCSC"
 #elif defined(__GLIBC__)
 #define DEFAULT_PCSC_DRIVER "libpcsclite.so.1"
 #else