diff --git a/check_postgres.pl b/check_postgres.pl
index ba28f27..67cb2c2 100755
--- a/check_postgres.pl
+++ b/check_postgres.pl
@@ -6125,7 +6125,7 @@ sub check_logfile {
     $SQL = q{
 SELECT name, CASE WHEN length(setting)<1 THEN '?' ELSE setting END AS s
 FROM pg_settings
-WHERE name IN ('log_destination','log_directory','log_filename','redirect_stderr','syslog_facility')
+WHERE name IN ('log_destination','log_directory','log_filename','redirect_stderr','syslog_facility','data_directory')
 ORDER BY name
 };
 
@@ -6171,6 +6171,10 @@ sub check_logfile {
                     ndie msg('logfile-stderr');
                 }
             }
+            elsif ($i->{log_destination} eq 'csvlog') {
+                $logfile = "$i->{'data_directory'}/$i->{log_directory}/$i->{log_filename}";
+                $logfile =~ s/\.log$/\.csv/;
+            }
         }
 
         ## We now have a logfile (or a template)..parse it into pieces.