diff --git a/pcsc-lite-1.6.1-crash_with_no_conf.patch b/pcsc-lite-1.6.1-crash_with_no_conf.patch
new file mode 100644
index 0000000..f230aba
--- /dev/null
+++ b/pcsc-lite-1.6.1-crash_with_no_conf.patch
@@ -0,0 +1,12 @@
+diff -up pcsc-lite-1.6.1/src/readerfactory.c.orig pcsc-lite-1.6.1/src/readerfactory.c
+--- pcsc-lite-1.6.1/src/readerfactory.c.orig	2010-07-04 23:42:14.000000000 +0300
++++ pcsc-lite-1.6.1/src/readerfactory.c	2010-07-04 23:42:23.000000000 +0300
+@@ -1312,7 +1312,7 @@ void RFCleanupReaders(void)
+ #ifdef USE_SERIAL
+ int RFStartSerialReaders(const char *readerconf)
+ {
+-	SerialReader *reader_list;
++	SerialReader *reader_list = NULL;
+ 	int i, rv;
+ 
+ 	/* remember the configuration filename for RFReCheckReaderConf() */
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index e78fb43..fe5d0a3 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -2,7 +2,7 @@
 
 Name:           pcsc-lite
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -14,6 +14,8 @@ Patch0:         %{name}-1.4-docinst.patch
 Patch1:         %{name}-1.5.5-rpath64.patch
 # http://lists.drizzle.com/pipermail/muscle/2010-July/008411.html
 Patch2:         %{name}-1.6.1-config_dir.patch
+# http://lists.drizzle.com/pipermail/muscle/2010-July/008413.html
+Patch3:         %{name}-1.6.1-crash_with_no_conf.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -65,6 +67,7 @@ BuildArch:      noarch
 %patch0 -p0 -b .docinst
 %patch1 -p1 -b .rpath64
 %patch2 -p0 -b .config_dir
+%patch3 -p1 -b .crash_with_no_conf
 
 # Convert to utf-8
 for file in ChangeLog; do
@@ -148,6 +151,9 @@ fi
 
 
 %changelog
+* Mon Jul 05 2010 Kalev Lember <kalev@smartlink.ee> - 1.6.1-4
+- Patch to fix crash with empty config directory
+
 * Sun Jul 04 2010 Kalev Lember <kalev@smartlink.ee> - 1.6.1-3
 - Patch to fix config dir handling