diff --git a/qpdf/fix-qdf b/qpdf/fix-qdf
index 7dc1f7e..b0e56e1 100755
--- a/qpdf/fix-qdf
+++ b/qpdf/fix-qdf
@@ -1,11 +1,12 @@
 #!/usr/bin/env perl
 
 require 5.008_001;
-BEGIN { $^W = 1; }
+use warnings;
 use strict;
+use File::Basename;
 
-my $whoami = ($0 =~ m,([^/\\]*)$,) ? $1 : $0;
-my $dirname = ($0 =~ m,(.*)[/\\][^/\\]+$,) ? $1 : ".";
+my $whoami = basename($0);
+my $dirname = dirname($0);
 
 if ((@ARGV == 1) && ($ARGV[0] eq '--version'))
 {