diff --git a/Makefile.PL b/Makefile.PL
index 114bf3f93f..8a42a1c39f 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -956,7 +956,7 @@ sub get_target_directories {
         $skipdirs{'INTRANET_TMPL_DIR'} = 1;
         $dirmap{'INTRANET_WWW_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl');
         $skipdirs{'INTRANET_WWW_DIR'} = 1;
-        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir, 'opac');
+        $dirmap{'OPAC_CGI_DIR'} = File::Spec->catdir($curdir);
         $skipdirs{'OPAC_CGI_DIR'} = 1;
         $dirmap{'OPAC_TMPL_DIR'} = File::Spec->catdir($curdir, 'koha-tmpl', 'opac-tmpl');
         $skipdirs{'OPAC_TMPL_DIR'} = 1;
@@ -1165,7 +1165,9 @@ sub postamble {
     # quote '$' in the two password parameters
     my %config = %config;
     $config{'DB_PASS'} =~ s/\$/\$\$/g;
-    $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
+    if ($config{'INSTALL_ZEBRA'} eq "yes") {
+        $config{'ZEBRA_PASS'} =~ s/\$/\$\$/g;
+    }
 
 	# Hereagain, we must alter syntax per platform...
 	if ( $^O eq 'MSWin32' ) {