diff --git a/BackupPC-TopDir_change.patch b/BackupPC-TopDir_change.patch
new file mode 100644
index 0000000..7500660
--- /dev/null
+++ b/BackupPC-TopDir_change.patch
@@ -0,0 +1,21 @@
+diff -up BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch BackupPC-3.1.0/lib/BackupPC/Lib.pm
+--- BackupPC-3.1.0/lib/BackupPC/Lib.pm.patch	2009-04-10 17:57:04.000000000 +0200
++++ BackupPC-3.1.0/lib/BackupPC/Lib.pm	2009-04-10 17:57:57.000000000 +0200
+@@ -152,8 +152,6 @@ sub new
+     # Clean up %ENV and setup other variables.
+     #
+     delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
+-    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
+-    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
+     if ( defined(my $error = $bpc->ConfigRead()) ) {
+         print(STDERR $error, "\n");
+         return;
+@@ -167,6 +165,8 @@ sub new
+         $paths->{$dir} = $bpc->{$dir} = $bpc->{Conf}{$dir};
+     }
+     $bpc->{storage}->setPaths($paths);
++    $bpc->{PoolDir}  = "$bpc->{TopDir}/pool";
++    $bpc->{CPoolDir} = "$bpc->{TopDir}/cpool";
+ 
+     #
+     # Verify we are running as the correct user
diff --git a/BackupPC.spec b/BackupPC.spec
index c7b9f60..b3b172d 100644
--- a/BackupPC.spec
+++ b/BackupPC.spec
@@ -6,8 +6,8 @@
 
 Name:           BackupPC
 Version:        3.1.0
-Release:        3%{?dist}
-Summary:        BackupPC - high-performance backup system
+Release:        4%{?dist}
+Summary:        High-performance backup system
 
 Group:          Applications/System
 License:        GPLv2+
@@ -16,6 +16,7 @@ Source0:        http://dl.sourceforge.net/backuppc/%{name}-%{version}.tar.gz
 Source1:        BackupPC.htaccess
 Source2:        BackupPC.logrotate
 Source3:        BackupPC-README.fedora
+Patch0:         BackupPC-TopDir_change.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -56,6 +57,7 @@ and easy to install and maintain.
 
 %prep
 %setup -q
+%patch0 -p1
 sed -i "s|\"backuppc\"|\"$LOGNAME\"|g" configure.pl
 iconv -f ISO-8859-1 -t UTF-8 ChangeLog > ChangeLog.utf && mv ChangeLog.utf ChangeLog
 pushd doc
@@ -226,6 +228,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 10 2009 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-4
+- Fix TopDir change (bug #473944)
+
 * Mon Aug 11 2008 Johan Cwiklinski <johan AT x-tnd DOT be> 3.1.0-3
 - using /dev/null with SELinux policy to avoid broken pipe errors (bug #432149)