diff --git a/Changelog b/Changelog
index 943f318..94a221f 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,9 @@
+ 2.18
+	 - fixed Bug #2325 (rt.cpan.org). The subs exported by File::Spec
+	   will now imported explicitly.
+	 - fixed warning about double my'ed variable $dummi, changed it
+	   to undef because it was unused anyway.
+
  2.17
 	 - added File::Spec support which makes the modules more portable
 	   (i.e. on win32 systems),
diff --git a/General.pm b/General.pm
index 1f83df6..238f8b8 100644
--- a/General.pm
+++ b/General.pm
@@ -13,12 +13,12 @@
 package Config::General;
 
 use FileHandle;
-use File::Spec::Functions;
+use File::Spec::Functions qw(splitpath file_name_is_absolute);
 use strict;
 use Carp;
 use Exporter;
 
-$Config::General::VERSION = "2.17";
+$Config::General::VERSION = "2.18";
 
 use vars  qw(@ISA @EXPORT);
 @ISA    = qw(Exporter);
@@ -230,7 +230,7 @@ sub new {
 	$self->{configfile} = $self->{ConfigFile};
 	if ( file_name_is_absolute($self->{ConfigFile}) ) {
 	  # look if is is an absolute path and save the basename if it is absolute
-	  my ($dummi, $path, $dummi) = splitpath($self->{ConfigFile});
+	  my (undef, $path, undef) = splitpath($self->{ConfigFile});
 	  $path =~ s#/$##; # remove eventually existing trailing slash
 	  $self->{configpath} = $path;
 	}
@@ -1805,7 +1805,7 @@ Thomas Linden <tom@daemon.de>
 
 =head1 VERSION
 
-2.17
+2.18
 
 =cut
 
diff --git a/README b/README
index 719cd52..4837d1b 100644
--- a/README
+++ b/README
@@ -104,4 +104,4 @@ AUTHOR
 
 
 VERSION
-	2.17
\ No newline at end of file
+	2.18
\ No newline at end of file