diff --git a/fontconfig.spec b/fontconfig.spec
index 0cb237a..fe99682 100644
--- a/fontconfig.spec
+++ b/fontconfig.spec
@@ -3,7 +3,7 @@
 Summary:	Font configuration and customization library
 Name:		fontconfig
 Version:	2.10.95
-Release:	2%{?dist}
+Release:	3%{?dist}
 # src/ftglue.[ch] is in Public Domain
 # src/fccache.c contains Public Domain code
 # fc-case/CaseFolding.txt is in the UCD
@@ -16,6 +16,7 @@ Source1:	25-no-bitmap-fedora.conf
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=140335
 Patch0:		fontconfig-2.8.0-sleep-less.patch
+Patch1:		fontconfig-no-dir-when-no-conf.patch
 
 BuildRequires:	expat-devel
 BuildRequires:	freetype-devel >= %{freetype_version}
@@ -57,6 +58,7 @@ which is useful for developing applications that uses fontconfig.
 %prep
 %setup -q
 %patch0 -p1 -b .sleep-less
+%patch1 -p1 -b .nodir
 
 %build
 # We don't want to rebuild the docs, but we want to install the included ones.
@@ -95,7 +97,7 @@ mkdir -p %{_localstatedir}/cache/fontconfig
 #  copy of fontconfig might install the binary instead of the first)
 # The HOME setting is to avoid problems if HOME hasn't been reset
 if [ -x /usr/bin/fc-cache ] && /usr/bin/fc-cache --version 2>&1 | grep -q %{version} ; then
-  HOME=/root XDG_CONFIG_HOME=/root/.config /usr/bin/fc-cache -f
+  HOME=/root /usr/bin/fc-cache -f
 fi
 
 %postun -p /sbin/ldconfig
@@ -133,9 +135,9 @@ fi
 %doc fontconfig-devel.txt fontconfig-devel
 
 %changelog
-* Mon Sep  2 2013 Akira TAGOH <tagoh@redhat.com> - 2.10.95-2
-- Set XDG_CONFIG_HOME explicitly at %%post to avoid creating directories
-  at non-root HOME with root. (#1003495)
+* Mon Sep  2 2013 Akira TAGOH <tagoh@redhat.com> - 2.10.95-3
+- Do not create a directory for migration when no old config file and directory.
+  (#1003495)
 
 * Sat Aug 31 2013 Akira TAGOH <tagoh@redhat.com> - 2.10.95-1
 - Fix a crash issue (#1003069)