diff --git a/MANIFEST b/MANIFEST
index ca5d3197..e48fc9ff 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -40,7 +40,6 @@ lib/Qpsmtpd/Auth.pm
 lib/Qpsmtpd/Base.pm
 lib/Qpsmtpd/Command.pm
 lib/Qpsmtpd/Config.pm
-lib/Qpsmtpd/ConfigServer.pm
 lib/Qpsmtpd/Connection.pm
 lib/Qpsmtpd/Constants.pm
 lib/Qpsmtpd/DB.pm
diff --git a/Makefile.PL b/Makefile.PL
index 4355b8da..40502983 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,7 +30,7 @@ WriteMakefile(
 #       'DBIx::Simple'       => 0,   # log2sql
 # modules that cause Travis build tests to fail
         'Mail::SpamAssassin' => 0,
-#       'GeoIP2'             => 2,
+        'GeoIP2'             => 2,
         'Geo::IP'            => 1,
         'Math::Complex'      => 0,   # geodesic distance in Geo::IP
         'PerlIO::gzip'       => 0,   # gunzip GeoIP databases
@@ -38,7 +38,7 @@ WriteMakefile(
     },
     ABSTRACT       => 'Flexible smtpd daemon written in Perl',
     AUTHOR         => 'Ask Bjoern Hansen <ask@develooper.com>',
-    EXE_FILES      => [qw(qpsmtpd qpsmtpd-forkserver)],
+    EXE_FILES      => [qw(qpsmtpd)],
     clean          => { FILES => [ '*.bak', 't/tmp' ], },
 );
 
diff --git a/qpsmtpd-forkserver b/qpsmtpd
similarity index 100%
rename from qpsmtpd-forkserver
rename to qpsmtpd
diff --git a/run.forkserver b/run
similarity index 100%
rename from run.forkserver
rename to run