diff --git a/perl.spec b/perl.spec
index 0869e52..7b2e8b2 100644
--- a/perl.spec
+++ b/perl.spec
@@ -20,7 +20,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        21%{?dist}
+Release:        22%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -108,11 +108,13 @@ Patch36:        perl-5.8.8-U34297_C28006.patch
 Patch37:        perl-5.8.8-useCFLAGSwithCC.patch
 # Upstream bug 39903
 Patch38:        perl-5.8.8-bz199736.patch
-# Disable test_hosts because some tests fail in mock buildroots
+# Disable test_hosts because hostname tests fail in mock buildroots
 Patch39:        perl-5.8.8-disable_test_hosts.patch
 # XXX: Fixme - Finish patch.
 #Patch39:        perl-5.8.8-bz204679.patch
 Patch40:	perl-5.8.8-U28775.patch
+Patch41:        perl-5.8.8-bz247386-file-spec-cwd.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{perl_version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  tcsh, dos2unix, man, groff
 BuildRequires:  gdbm-devel, db4-devel
@@ -344,8 +346,9 @@ upstream tarball from perl.org.
 %patch36 -p1
 %patch37 -p1
 %patch38 -p1
-#%patch39 -p1
+%patch39 -p1
 %patch40 -p1
+%patch41 -p1
 #
 # Candidates for doc recoding (need case by case review):
 # find . -name "*.pod" -o -name "README*" -o -name "*.pm" | xargs file -i | grep charset= | grep -v '\(us-ascii\|utf-8\)'
@@ -742,6 +745,12 @@ make test
 # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
 
 %changelog
+* Tue Jul 24 2007 Robin Norwood <rnorwood@redhat.com> - 4:5.8.8-22
+- Resolves: rhbz#247386
+- Use getcwd() instead of cwd() in File::Spec::Unix to avoid forking.
+- Appy patch to skip hostname tests, since hostname lookup isn't
+  available in Fedora buildroots by design.
+
 * Mon Jul  2 2007 Tom "spot" Callaway <tcallawa@redhat.com> - 4:5.8.8-21
 - perl-core metapackage