diff --git a/src/configure b/src/configure
index 4835fb374..d9d10b5b1 100755
--- a/src/configure
+++ b/src/configure
@@ -309,7 +309,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS GCLIB SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME INSTALL_TARGET ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT INFOEXT INSTALL_INFO CLX_INFO CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ECL_VERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os thehost builddir docdir top_srcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP RANLIB ac_ct_RANLIB INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA LN_S ECL_CC ECL_CFLAGS CLIBS GCLIB SHARED_LDFLAGS BUNDLE_LDFLAGS SHORT_SITE_NAME LONG_SITE_NAME EXTRA_OBJS TARGETS TKLIBS SUBDIR LIBRARIES LSP_LIBRARIES BOEHM_HEADERS EGREP true_srcdir true_builddir CP RM MV EXE_SUFFIX ARCHITECTURE SOFTWARE_TYPE SOFTWARE_VERSION MACHINE_INSTANCE MACHINE_VERSION LDRPATH LIBPREFIX LIBEXT SHAREDEXT SHAREDPREFIX LDINSTALLNAME INSTALL_TARGET ECL_SETJMP ECL_LONGJMP ECL_FILE_CNT INFOEXT INSTALL_INFO CLX_INFO CL_FIXNUM_TYPE CL_FIXNUM_BITS CL_FIXNUM_MAX CL_FIXNUM_MIN X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINCLUDES XLIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1397,6 +1397,7 @@ host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
 
 
+
 # Check whether --with-clx or --without-clx was given.
 if test "${with_clx+set}" = set; then
   withval="$with_clx"
@@ -3745,6 +3746,7 @@ fi
 
 libdir="${libdir}/ecl"
 includedir="${libdir}/ecl/h"
+if  -z "${docdir}" ; then docdir="${shareddir}/doc/ecl"; fi
 
 
 
@@ -6730,6 +6732,7 @@ s,@host_vendor@,$host_vendor,;t t
 s,@host_os@,$host_os,;t t
 s,@thehost@,$thehost,;t t
 s,@builddir@,$builddir,;t t
+s,@docdir@,$docdir,;t t
 s,@top_srcdir@,$top_srcdir,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
diff --git a/src/configure.in b/src/configure.in
index 1211eec12..d7f3838a5 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -46,6 +46,7 @@ AC_SUBST(mandir)
 AC_SUBST(infodir)
 AC_SUBST(builddir)
 AC_SUBST(libdir)
+AC_SUBST(docdir)
 AC_SUBST(top_srcdir)
 dnl AC_ARG_ENABLE(tk,
 dnl 	[--enable-tk            Include Tk.],
@@ -148,6 +149,7 @@ dnl		Installation directories
 dnl
 libdir="${libdir}/ecl"
 includedir="${libdir}/ecl/h"
+if [ -z "${docdir}" ]; then docdir="${shareddir}/doc/ecl"; fi
 
 dnl ----------------------------------------------------------------------
 dnl		Checks which do not come with autoconf
diff --git a/src/doc/Makefile.in b/src/doc/Makefile.in
index 02ed35f0b..eaf4971d9 100644
--- a/src/doc/Makefile.in
+++ b/src/doc/Makefile.in
@@ -5,6 +5,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 infodir = @infodir@
 mandir=@mandir@
+dodcdir=@docdir@
 manext=1
 
 INFOEXT = @INFOEXT@
@@ -48,24 +49,31 @@ install: all
 	    $(INSTALL_INFO) --info-dir=$(infodir) $$k; \
 	  fi; \
 	done
+	$(mkinstalldirs) $(docdir)
+	for i in Copyright LGPL; do \
+	  $(INSTALL_DATA) $(top_srcdir)/../../$i $(docdir); \
+	done
 	$(mkinstalldirs) $(mandir)/man$(manext)
 	$(INSTALL_DATA) ecl.man $(mandir)/man$(manext)/ecl.$(manext)
 flatinstall: all
-	$(mkinstalldirs) $(prefix)/doc
-	for k in $(INFO_FILES); do $(INSTALL_DATA) $$k $(prefix)/doc; done
+	$(mkinstalldirs) $(docdir)
+	for k in $(INFO_FILES); do $(INSTALL_DATA) $$k $(docdir); done
 	if [ -f user.html ]; then \
-	  $(INSTALL_DATA) $$i $(prefix)/doc/; \
+	  $(INSTALL_DATA) $$i $(docdir)/; \
 	else \
-	  $(mkinstalldirs) $(prefix)/doc/ecl; \
-	  for i in ecl/*; do $(INSTALL_DATA) $$i $(prefix)/doc/ecl/; done; \
+	  $(mkinstalldirs) $(docdir)/ecl; \
+	  for i in ecl/*; do $(INSTALL_DATA) $$i $(docdir)/ecl/; done; \
 	fi
 	if [ -f devel.html ]; then \
-	  $(INSTALL_DATA) devel.html $(prefix)/doc/; \
+	  $(INSTALL_DATA) devel.html $(docdir)/; \
 	else \
-	  $(mkinstalldirs) $(prefix)/doc/ecldev; \
-	  for i in ecldev/*; do $(INSTALL_DATA) $$i $(prefix)/doc/ecldev/; done; \
+	  $(mkinstalldirs) $(docdir)/ecldev; \
+	  for i in ecldev/*; do $(INSTALL_DATA) $$i $(docdir)/ecldev/; done; \
 	fi
-	for i in *.html; do $(INSTALL_DATA) $$i $(prefix)/doc/; done
+	for i in Copyright LGPL; do \
+	  $(INSTALL_DATA) $(top_srcdir)/../../$i $(docdir); \
+	done
+	for i in *.html; do $(INSTALL_DATA) $$i $(docdir)/; done
 
 uninstall:
 	for k in $(INFO_FILES); do \