diff --git a/C4/Database.pm b/C4/Database.pm
index 81ae6f38ab..11664e1fcf 100755
--- a/C4/Database.pm
+++ b/C4/Database.pm
@@ -53,11 +53,27 @@ my $priv_func = sub {
 
 sub C4Connect  {
   my $dbname="c4"; 
-#  my $dbh = DBI->connect("dbi:Pg:dbname=$dbname", "chris", "");
-   my $database='c4test';
-   my $hostname='localhost';
-   my $user='hdl';
-   my $pass='testing';
+   my ($database,$hostname,$user,$pass,%configfile);
+   open (KC, "/etc/koha.conf");
+   while (<KC>) {
+     chomp;
+     (next) if (/^\s*#/);
+     if (/(.*)\s*=\s*(.*)/) {
+       my $variable=$1;
+       my $value=$2;
+       # Clean up white space at beginning and end
+       $variable=~s/^\s*//g;
+       $variable=~s/\s*$//g;
+       $value=~s/^\s*//g;
+       $value=~s/\s*$//g;
+       $configfile{$variable}=$value;
+     }
+   }
+   $database=$configfile{'database'};
+   $hostname=$configfile{'hostname'};
+   $user=$configfile{'user'};
+   $pass=$configfile{'pass'};
+    
    my $dbh=DBI->connect("DBI:mysql:$database:$hostname",$user,$pass);
   return $dbh;
 }