diff --git a/lam-packaging/debian/control b/lam-packaging/debian/control
index 3b5e0842..732702fd 100644
--- a/lam-packaging/debian/control
+++ b/lam-packaging/debian/control
@@ -10,7 +10,7 @@ Package: ldap-account-manager
 Architecture: all
 Depends: php5 (>= 5.1), php5-ldap, apache | apache-ssl | apache-perl | apache2 | httpd, php-fpdf, debconf (>= 0.2.26) | debconf-2.0
 Recommends: php5-mhash
-Suggests: ldap-server, sudo, perl, php5-mcrypt
+Suggests: ldap-server, sudo, perl, php5-mcrypt, ldap-account-manager-lamdaemon
 Description: webfrontend for managing accounts in an LDAP directory
  LDAP Account Manager (LAM) runs on an existing webserver. LAM
  supports LDAP connections via SSL and TLS. It manages user, group
@@ -26,8 +26,7 @@ Description: webfrontend for managing accounts in an LDAP directory
 Package: ldap-account-manager-lamdaemon
 Architecture: all
 Depends: perl
-Conflicts: ldap-account-manager
-Description: Lamdaemon is part of LDAP Account Manager. It
- is used to manage quotas and home directories. This package
+Description: Lamdaemon is used to manage quotas and home directories.
+ It is part of LDAP Account Manager. This package
  needs to be installed on the server where the home directories
- reside and quotas should be managed.
+ reside and/or quotas should be managed.
diff --git a/lam-packaging/debian/rules b/lam-packaging/debian/rules
index e52adfeb..5de48773 100755
--- a/lam-packaging/debian/rules
+++ b/lam-packaging/debian/rules
@@ -34,7 +34,6 @@ install:
 	install -D --mode=644 lib/.htaccess debian/ldap-account-manager/usr/share/ldap-account-manager/lib/.htaccess
 	install -D --mode=644 lib/*.inc debian/ldap-account-manager/usr/share/ldap-account-manager/lib
 	install -D --mode=644 lib/ufpdf.php debian/ldap-account-manager/usr/share/ldap-account-manager/lib/ufpdf.php
-	install -D --mode=755 lib/*.pl debian/ldap-account-manager/usr/share/ldap-account-manager/lib
 	cp -r lib/font debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r lib/modules debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
 	cp -r lib/types debian/ldap-account-manager/usr/share/ldap-account-manager/lib/
@@ -44,6 +43,7 @@ install:
 	cp -r templates debian/ldap-account-manager/usr/share/ldap-account-manager/
 
 	install -D --mode=755 lib/lamdaemon.pl debian/ldap-account-manager-lamdaemon/usr/share/ldap-account-manager/lib/lamdaemon.pl
+	install -D --mode=755 lib/lamdaemonOld.pl debian/ldap-account-manager-lamdaemon/usr/share/ldap-account-manager/lib/lamdaemonOld.pl
 
 # Build architecture-independent files here.
 binary-dep: build install