diff --git a/lam-packaging/RPM/ldap-account-manager.spec b/lam-packaging/RPM/ldap-account-manager.spec
index 28ae56c2..5c755a30 100644
--- a/lam-packaging/RPM/ldap-account-manager.spec
+++ b/lam-packaging/RPM/ldap-account-manager.spec
@@ -77,10 +77,13 @@ chown %{lam_uid}.%{lam_gid} -R $RPM_BUILD_ROOT%{httpd_rootdir}/%{lam_dir}/sess
 
 %files
 %defattr(-, root, root)
-%doc docs/*txt COPYING HISTORY INSTALL README VERSION
+%doc COPYING HISTORY README docs
 %{httpd_rootdir}/%{lam_dir}
 
 %changelog
+* Sat Nov 07 2009 - Roland Gruber post@rolandgruber.de
+- Added LAM manuals
+
 * Sat Jul 26 2008 - Roland Gruber post@rolandgruber.de
 - Added subpackage for lamdaemon
 
diff --git a/lam-packaging/autoconf/Makefile.in b/lam-packaging/autoconf/Makefile.in
index 829bc758..9e9e63c6 100644
--- a/lam-packaging/autoconf/Makefile.in
+++ b/lam-packaging/autoconf/Makefile.in
@@ -34,18 +34,9 @@ top_builddir = .
 HTTPD_USER = @HTTPD_USER@
 HTTPD_GROUP = @HTTPD_GROUP@
 
-#INSTALL_PROGRAM = $(INSTALL)
-#INSTALL_DATA = $(INSTALL) -m 644
-#INSTALL_SCRIPT = $(INSTALL) -m 755
+DOCS = COPYING HISTORY README copyright
 
-DOCS = COPYING HISTORY INSTALL README copyright \
-	docs/README.Kolab.txt docs/README.fpdf.htm \
-	docs/README.hosts.txt docs/README.lamdaemon.txt \
-	docs/README.openldap.txt docs/README.schema.txt \
-	docs/README.security.txt docs/README.upgrade.txt \
-	docs/schema/dhcp.schema
-
-HTML_DOCS = docs/devel
+HTML_DOCS = docs
 
 LIST1 = graphics help index.html lib locale style templates VERSION
 LIST2 = sess tmp
diff --git a/lam-packaging/buildPackages b/lam-packaging/buildPackages
index 41f4e296..b4b8b259 100755
--- a/lam-packaging/buildPackages
+++ b/lam-packaging/buildPackages
@@ -26,6 +26,12 @@ rm lam/lib/font/*.ttf
 find . -name .cvsignore -exec rm {} \;
 mv lam ldap-account-manager-$VERSION
 
+# create LAM manual
+cd ldap-account-manager-$VERSION/docs/manual-sources
+./make.sh
+cd ../../..
+rm -r ldap-account-manager-$VERSION/docs/manual-sources
+
 # create LAM Pro documentation
 cd lamPro/docs/LAMProHowTo-sources
 ./make.sh
diff --git a/lam-packaging/debian/ldap-account-manager-lamdaemon.docs b/lam-packaging/debian/ldap-account-manager-lamdaemon.docs
index 6e1ac804..366cc549 100644
--- a/lam-packaging/debian/ldap-account-manager-lamdaemon.docs
+++ b/lam-packaging/debian/ldap-account-manager-lamdaemon.docs
@@ -1,2 +1,2 @@
-docs/README.lamdaemon.txt
+docs/