diff --git a/debian/dirs b/debian/dirs
index f022d14..7195dd7 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,8 +1,7 @@
 usr/share/doc/cdrtool
-etc/apache2/conf.d
 etc/cdrtool
 etc/cdrtool/local
 var/spool/cdrtool
 var/spool/cdrtool/normalize
 var/www/CDRTool
 var/www/CDRTool/templates_c
diff --git a/debian/rules b/debian/rules
index f220a27..a4e20db 100644
--- a/debian/rules
+++ b/debian/rules
@@ -1,92 +1,92 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
 
 #export DH_VERBOSE=1
 export DH_ALWAYS_EXCLUDE=_darcs
 
 configure: configure-stamp
 
 configure-stamp:
 	dh_testdir
 	touch configure-stamp
 
 build-arch: build-stamp
 build-indep: build-stamp
 build: build-stamp
 
 build-stamp: configure-stamp
 	dh_testdir
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	dh_clean
 	rm -f build-stamp configure-stamp
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
 	cp -a doc debian/cdrtool/usr/share/doc/cdrtool/
 	cp -a setup/*sample debian/cdrtool/etc/cdrtool/
 	cp -a debian/copyright debian/cdrtool/usr/share/doc/cdrtool/
 	cp -a setup/csv debian/cdrtool/usr/share/doc/cdrtool/rating-sample-files
 	cp -a images debian/cdrtool/var/www/CDRTool/
 	cp -a library debian/cdrtool/var/www/CDRTool/
 	cp -a templates debian/cdrtool/var/www/CDRTool/
 	cp -a contrib debian/cdrtool/var/www/CDRTool/
 	cp -a doc debian/cdrtool/var/www/CDRTool/
 	cp -a phplib debian/cdrtool/var/www/CDRTool/
 	cp -a scripts debian/cdrtool/var/www/CDRTool/
 	cp -a setup debian/cdrtool/var/www/CDRTool/
 	cp -a status debian/cdrtool/var/www/CDRTool/
 	cp -a po debian/cdrtool/var/www/CDRTool/
 	cp -a *.js debian/cdrtool/var/www/CDRTool/
 	cp -a timezones debian/cdrtool/var/www/CDRTool/
-	cp -a version debian/cdrtool/var/www/CDRTool/	
-	cp -a .htaccess debian/cdrtool/var/www/CDRTool/	
+	cp -a version debian/cdrtool/var/www/CDRTool/
+	cp -a .htaccess debian/cdrtool/var/www/CDRTool/
 	cp *.phtml debian/cdrtool/var/www/CDRTool/
 	cp *.css debian/cdrtool/var/www/CDRTool/
 	cp debian/changelog debian/cdrtool/var/www/CDRTool/doc/
 	cp -a bootstrap debian/cdrtool/var/www/CDRTool/
 
 # Build architecture-dependent files here.
 binary-arch: build install
 # We have nothing to do by default.
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs
 	dh_lintian
 #	dh_installdocs
 	dh_installexamples
 #	dh_install
 #	dh_installmenu
 #	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
 #	dh_python
 	dh_installinit
 	dh_installcron
 #	dh_installinfo
 #	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
 #	dh_perl
 #	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/setup/apache2/conf.d/cdrtool b/setup/apache2/conf-available/cdrtool.conf
similarity index 66%
rename from setup/apache2/conf.d/cdrtool
rename to setup/apache2/conf-available/cdrtool.conf
index 6d750ac..6cda17e 100644
--- a/setup/apache2/conf.d/cdrtool
+++ b/setup/apache2/conf-available/cdrtool.conf
@@ -1,41 +1,34 @@
 <Directory /var/www/CDRTool>
         DirectoryIndex index.phtml index.html
 	<Files ~ "~$">
-	Order allow,deny
-	Deny from all
+	Require all denied
 	</Files>
 	<Files *.inc>
-	Order allow,deny
-	Deny from all
+	Require all denied
 	</Files>
 	<Files *_lib.*>
-	Order allow,deny
-	Deny from all
+	Require all denied
 	</Files>
 	<Files *.csv>
-	Order allow,deny
-	Deny from all
+	Require all denied
 	</Files>
 	<Files _darcs>
-	Order allow,deny
-	Deny from all
+	Require all denied
 	</Files>
 </Directory>
 
 <Directory /var/www/CDRTool/scripts>
 	<Limit PUT GET POST HEAD>
-	order deny,allow
-	deny from all
+	Require all denied
 	</Limit>
 </Directory>
 
 <Directory /var/www/CDRTool/doc>
 	Options +Indexes +MultiViews
 </Directory>
 
 <Directory /var/www/CDRTool/csv>
 	<Limit PUT GET POST HEAD>
-	order deny,allow
-	deny from all
+	Require all denied
 	</Limit>
 </Directory>