diff --git a/ChangeLog b/ChangeLog
index c24f02152..9e3cc2c33 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
    on Ben's work
  - (djm) Specify --datadir in RPM spec files so smartcard applet gets
     put somewhere sane. Add Ssh.bin to manifest.
+ - (djm) Make smartcard support conditional in Redhat RPM spec
 
 20010917
  - (djm) x11-ssh-askpass-1.2.4 in RPM spec, revert workarounds
@@ -6466,4 +6467,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1529 2001/09/18 05:12:10 djm Exp $
+$Id: ChangeLog,v 1.1530 2001/09/18 05:33:07 djm Exp $
diff --git a/contrib/redhat/openssh.spec b/contrib/redhat/openssh.spec
index ca1c20d1d..2cda144a2 100644
--- a/contrib/redhat/openssh.spec
+++ b/contrib/redhat/openssh.spec
@@ -13,6 +13,9 @@
 # Do we want to link against a static libcrypto? (1=yes 0=no)
 %define static_libcrypto 0
 
+# Do we want smartcard support (1=yes 0=no)
+%define scard 0
+
 # Use Redhat 7.0 pam control file
 %define redhat7 0
 
@@ -29,6 +32,10 @@
 # rpm -ba|--rebuild --define "static_openssl 1"
 %{?static_openssl:%define static_libcrypto 1}
 
+# Options for Smartcard support: (needs libsectok and openssl-engine)
+# rpm -ba|--rebuild --define "smartcard 1"
+%{?smartcard:%define scard 1}
+
 %define exact_openssl_version   %(rpm -q openssl | cut -d - -f 2)
 
 Summary: The OpenSSH implementation of SSH.
@@ -137,6 +144,12 @@ GNOME GUI desktop environment.
 
 %define _sysconfdir /etc/ssh
 
+EXTRA_OPTS=""
+
+%if %{smartcard}
+	EXTRA_OPTS="$EXTRA_OPTS --with-smartcard"
+%endif
+
 %configure \
 	--libexecdir=%{_libexecdir}/openssh \
 	--datadir=%{_datadir}/openssh \
@@ -144,7 +157,8 @@ GNOME GUI desktop environment.
 	--with-tcp-wrappers \
 	--with-ipv4-default \
 	--with-rsh=/usr/bin/rsh \
-	--with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
+	--with-default-path=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin \
+	$EXTRA_OPTS
 
 %if %{static_libcrypto}
 perl -pi -e "s|-lcrypto|/usr/lib/libcrypto.a|g" Makefile
@@ -223,8 +237,10 @@ fi
 %attr(0755,root,root) %dir %{_sysconfdir}
 %attr(0600,root,root) %config(noreplace) %{_sysconfdir}/moduli
 %attr(0755,root,root) %dir %{_libexecdir}/openssh
+%if %{smartcard}
 %attr(0755,root,root) %dir %{_datadir}/openssh
 %attr(0644,root,root) %{_datadir}/openssh/Ssh.bin
+%endif
 
 %files clients
 %defattr(-,root,root)