diff --git a/lam-packaging/RPM/ldap-account-manager.spec b/lam-packaging/RPM/ldap-account-manager.spec
index 753be093..b2425b1e 100644
--- a/lam-packaging/RPM/ldap-account-manager.spec
+++ b/lam-packaging/RPM/ldap-account-manager.spec
@@ -85,11 +85,11 @@ cp $RPM_BUILD_DIR/lam.apache.conf $RPM_BUILD_ROOT%{httpd_confdir}/
 
 %post
 if [ ! -f /var/lib/%{lam_dir}/config/config.cfg ]; then
-	cp /var/lib/%{lam_dir}/config/config.cfg_sample /var/lib/%{lam_dir}/config/config.cfg
+	cp /var/lib/%{lam_dir}/config/config.cfg.sample /var/lib/%{lam_dir}/config/config.cfg
 	chmod 600 /var/lib/%{lam_dir}/config/config.cfg
 	chown %{lam_uid}:%{lam_gid} /var/lib/%{lam_dir}/config/config.cfg
 	if [ ! -f /var/lib/%{lam_dir}/config/lam.conf ]; then
-		cp /var/lib/%{lam_dir}/config/lam.conf_sample /var/lib/%{lam_dir}/config/lam.conf
+		cp /var/lib/%{lam_dir}/config/lam.conf.sample /var/lib/%{lam_dir}/config/lam.conf
 		chmod 600 /var/lib/%{lam_dir}/config/lam.conf
 		chown %{lam_uid}:%{lam_gid} /var/lib/%{lam_dir}/config/lam.conf
 	fi
@@ -128,7 +128,7 @@ fi
 %dir %attr(700, %{lam_uid}, %{lam_gid}) /var/lib/%{lam_dir}/config/templates/pdf
 %dir %attr(700, %{lam_uid}, %{lam_gid}) /var/lib/%{lam_dir}/config/templates/profiles
 %dir %attr(700, %{lam_uid}, %{lam_gid}) /var/lib/%{lam_dir}/config/selfService
-/var/lib/%{lam_dir}/config/*_sample
+/var/lib/%{lam_dir}/config/*.sample
 /var/lib/%{lam_dir}/config/.htaccess
 /var/lib/%{lam_dir}/config/pdf/.htaccess
 /var/lib/%{lam_dir}/config/profiles/.htaccess
diff --git a/lam-packaging/debian/postinst b/lam-packaging/debian/postinst
index 6d66a91d..b548abae 100755
--- a/lam-packaging/debian/postinst
+++ b/lam-packaging/debian/postinst
@@ -49,7 +49,7 @@ chmod 700 /var/lib/ldap-account-manager/tmp
 chown -R www-data /var/lib/ldap-account-manager/config
 chmod 700 /var/lib/ldap-account-manager/config
 if [ ! -f /var/lib/ldap-account-manager/config/lam.conf ]; \
-   then cp /var/lib/ldap-account-manager/config/lam.conf_sample /var/lib/ldap-account-manager/config/lam.conf; \
+   then cp /var/lib/ldap-account-manager/config/lam.conf.sample /var/lib/ldap-account-manager/config/lam.conf; \
 	chown www-data /var/lib/ldap-account-manager/config/lam.conf; fi
 chmod 600 /var/lib/ldap-account-manager/config/*.conf
 if [ "$1" = "configure" ]; then
diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules
index baa5fdf3..e81a1cb4 100755
--- a/lam-packaging/debian/rules
+++ b/lam-packaging/debian/rules
@@ -27,8 +27,8 @@ install:
 	install -D --mode=644 tmp/internal/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/tmp/internal/.htaccess
 	install -D --mode=644 config/.htaccess debian/ldap-account-manager/var/lib/ldap-account-manager/config/.htaccess
 	install -D --mode=644 config/language debian/ldap-account-manager/var/lib/ldap-account-manager/config/language
-	install -D --mode=644 config/lam.conf_sample debian/ldap-account-manager/var/lib/ldap-account-manager/config/lam.conf_sample
-	install -D --mode=644 config/config.cfg_sample debian/ldap-account-manager/var/lib/ldap-account-manager/config/config.cfg_sample
+	install -D --mode=644 config/lam.conf.sample debian/ldap-account-manager/var/lib/ldap-account-manager/config/lam.conf.sample
+	install -D --mode=644 config/config.cfg.sample debian/ldap-account-manager/var/lib/ldap-account-manager/config/config.cfg.sample
 	install -d --mode=755 debian/ldap-account-manager/var/lib/ldap-account-manager/config/pdf
 	install -d --mode=755 debian/ldap-account-manager/var/lib/ldap-account-manager/config/profiles
 	install -d --mode=755 debian/ldap-account-manager/usr/share/ldap-account-manager/config-samples
@@ -71,7 +71,7 @@ binary-indep: build install
 	dh_fixperms
 	dh_link /usr/share/doc/ldap-account-manager/docs /usr/share/ldap-account-manager/docs
 	install -D --mode=644 debian/lam.apache.conf debian/ldap-account-manager/etc/ldap-account-manager/apache.conf
-	install -D --mode=644 config/config.cfg_sample debian/ldap-account-manager/etc/ldap-account-manager/config.cfg
+	install -D --mode=644 config/config.cfg.sample debian/ldap-account-manager/etc/ldap-account-manager/config.cfg
 	dh_link /etc/ldap-account-manager/config.cfg /var/lib/ldap-account-manager/config/config.cfg
 	dh_installdebconf
 	dh_installdeb