diff -ru nagios/sample-config/httpd.conf.in nagios-om/sample-config/httpd.conf.in
--- nagios/sample-config/httpd.conf.in	2005-11-26 23:47:52.000000000 +0100
+++ nagios-om/sample-config/httpd.conf.in	2012-11-16 17:40:55.000000000 +0100
@@ -6,9 +6,9 @@
 # configuration file.  Customize the paths, etc. as
 # needed to fit your system.
 
-ScriptAlias @cgiurl@ "@sbindir@"
+ScriptAlias @cgiurl@ "@cgidir@"
 
-<Directory "@sbindir@">
+<Directory "@cgidir@">
 #  SSLRequireSSL
    Options ExecCGI
    AllowOverride None
diff -ru nagios/subst.in nagios-om/subst.in
--- nagios/subst.in	2009-07-08 00:34:51.000000000 +0200
+++ nagios-om/subst.in	2012-11-16 17:41:38.000000000 +0100
@@ -31,6 +31,7 @@
 		s|\@datadir\@|@datadir@|g;
 		s|\@sbindir\@|@sbindir@|g;
 		s|\@bindir\@|@bindir@|g;
+		s|\@cgidir\@|@libdir@/cgi-bin/|g;
 		s|\@htmurl\@|@htmurl@|g;
 		s|\@cgiurl\@|@cgiurl@|g;
 		s|\@MAIL_PROG\@|@MAIL_PROG@|g;