diff --git a/livesupport/bin/copyInstall.sh b/livesupport/bin/copyInstall.sh
index 69deaf4ef..8194fef83 100755
--- a/livesupport/bin/copyInstall.sh
+++ b/livesupport/bin/copyInstall.sh
@@ -22,7 +22,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.2 $
+#   Version  : $Revision: 1.3 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/bin/Attic/copyInstall.sh,v $
 #-------------------------------------------------------------------------------                                                                                
 #-------------------------------------------------------------------------------
@@ -165,7 +165,7 @@ cp -pPR $products_dir/scheduler/bin/scheduler.sh $install_bin
 cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport $install_bin
 cp -pPR $products_dir/gLiveSupport/bin/gLiveSupport.sh $install_bin
 cp -pPR $products_dir/gLiveSupport/var/widgets $install_var
-cp -pPR $products_dir/gLiveSupport/var/gLiveSuppprt*.res $install_var
+cp -pPR $products_dir/gLiveSupport/tmp/gLiveSupport*.res $install_var
 
 
 #-------------------------------------------------------------------------------
diff --git a/livesupport/etc/Makefile.in b/livesupport/etc/Makefile.in
index fdb481e92..0a0bfb9be 100644
--- a/livesupport/etc/Makefile.in
+++ b/livesupport/etc/Makefile.in
@@ -21,7 +21,7 @@
 #
 #
 #   Author   : $Author: maroy $
-#   Version  : $Revision: 1.2 $
+#   Version  : $Revision: 1.3 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/etc/Makefile.in,v $
 #-------------------------------------------------------------------------------
 
@@ -100,6 +100,7 @@ PLAYLIST_EXECUTOR_DIR = ${MODULES_DIR}/playlistExecutor
 EVENT_SCHEDULER_DIR   = ${MODULES_DIR}/eventScheduler
 SCHEDULER_CLIENT_DIR  = ${MODULES_DIR}/schedulerClient
 WIDGETS_DIR           = ${MODULES_DIR}/widgets
+ARCHIVE_SERVER_DIR    = ${MODULES_DIR}/archiveServer
 STORAGE_SERVER_DIR    = ${MODULES_DIR}/storageServer
 
 PRODUCTS_DIR  = ${BASE_DIR}/products
@@ -196,7 +197,7 @@ ${TMP_DIR}/modules_setup.stamp:
 	${EVENT_SCHEDULER_DIR}/bin/autogen.sh
 	${SCHEDULER_CLIENT_DIR}/bin/autogen.sh
 	${WIDGETS_DIR}/bin/autogen.sh
-#	-${MAKE} -C ${STORAGE_SERVER_DIR} dir_setup
+	-${MAKE} -C ${ARCHIVE_SERVER_DIR} all
 	-${MAKE} -C ${STORAGE_SERVER_DIR} all
 	touch ${TMP_DIR}/modules_setup.stamp
 
@@ -229,6 +230,7 @@ depclean:
 	${MAKE} -C ${WIDGETS_DIR} depclean
 	${MAKE} -C ${SCHEDULER_DIR} depclean
 	${MAKE} -C ${GLIVESUPPORT_DIR} depclean
+	-${MAKE} -C ${ARCHIVE_SERVER_DIR} depclean
 	-${MAKE} -C ${STORAGE_SERVER_DIR} depclean
 
 compile: ${TMP_DIR}/compile.stamp
@@ -256,6 +258,7 @@ check:
 	-${MAKE} -C ${WIDGETS_DIR} check
 	-${MAKE} -C ${SCHEDULER_DIR} check
 #	-${MAKE} -C ${GLIVESUPPORT_DIR} check
+#	-${MAKE} -C ${ARCHIVE_SERVER_DIR} check
 #	-${MAKE} -C ${STORAGE_SERVER_DIR} check
 
 
diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules
index 1ff08df1b..885de9c7e 100755
--- a/livesupport/etc/debian/rules
+++ b/livesupport/etc/debian/rules
@@ -81,6 +81,7 @@ install-arch:
 	mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/bin
 	mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
 	mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/tmp
+	mkdir -p $(CURDIR)/debian/livesupport-station/opt/livesupport/var
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/scheduler.sh \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallScheduler.sh \
@@ -88,8 +89,12 @@ install-arch:
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/scheduler.xml* \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/etc/odbc* \
 		  $(CURDIR)/debian/livesupport-station/opt/livesupport/etc
-	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var \
-          $(CURDIR)/debian/livesupport-station/opt/livesupport
+	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/alib \
+          $(CURDIR)/debian/livesupport/opt/livesupport/var/archiveServer \
+          $(CURDIR)/debian/livesupport/opt/livesupport/var/getid3 \
+          $(CURDIR)/debian/livesupport/opt/livesupport/var/htmlUI \
+          $(CURDIR)/debian/livesupport/opt/livesupport/var/storageServer \
+          $(CURDIR)/debian/livesupport-station/opt/livesupport/var
 
 	# now separate the studio (client) files into debian/livesupport-studio
 	mkdir -p $(CURDIR)/debian/livesupport-studio
@@ -97,6 +102,7 @@ install-arch:
 	mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/bin
 	mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/etc
 	mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/tmp
+	mkdir -p $(CURDIR)/debian/livesupport-studio/opt/livesupport/var
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/gLiveSupport.sh \
 	      $(CURDIR)/debian/livesupport/opt/livesupport/bin/postInstallGLiveSupport.sh \