diff --git a/livesupport/etc/debian/rules b/livesupport/etc/debian/rules
index 772d8768d..71360f708 100755
--- a/livesupport/etc/debian/rules
+++ b/livesupport/etc/debian/rules
@@ -107,6 +107,9 @@ install-arch:
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/htmlUI \
           $(CURDIR)/debian/livesupport/opt/livesupport/var/LiveSupport/storageServer \
               $(CURDIR)/debian/livesupport-station/opt/livesupport/var/LiveSupport
+	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/usr/bin \
+           $(CURDIR)/debian/livesupport/opt/livesupport/usr/var \
+           $(CURDIR)/debian/livesupport-station/opt/livesupport/usr
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/var/cache \
               $(CURDIR)/debian/livesupport-station/opt/livesupport/var
 	mv -f $(CURDIR)/debian/livesupport/opt/livesupport/etc/apache \
diff --git a/livesupport/modules/storageAdmin/etc/Makefile.in b/livesupport/modules/storageAdmin/etc/Makefile.in
index d5be07fcc..bdfa89308 100644
--- a/livesupport/modules/storageAdmin/etc/Makefile.in
+++ b/livesupport/modules/storageAdmin/etc/Makefile.in
@@ -21,7 +21,7 @@
 #
 #
 #   Author   : Author$
-#   Version  : $Revision: 1.2 $
+#   Version  : $Revision: 1.3 $
 #   Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/storageAdmin/etc/Makefile.in,v $
 #
 #   @configure_input@
@@ -73,7 +73,8 @@ DOXYGEN_CONFIG  = ${ETC_DIR}/doxygen.config
 PHP_DIR         = ${VAR_DIR}
 #TEST_RUNNER     = ${PHP_DIR}/tests/index.php
 
-DEST_DIR   = ${USR_VAR_DIR}/LiveSupport/storageAdmin/var
+#DEST_DIR   = ${USR_VAR_DIR}/LiveSupport/storageAdmin/var
+DEST_DIR   = ${USR_DIR}/usr
 
 USR_VAR_DIR_S=$(shell ${ECHO} ${USR_VAR_DIR} | ${SED} -e "s/\//\\\\\\\\\//g")
 
@@ -128,10 +129,10 @@ distclean: clean docclean
 check: all
 
 install:
-	${CP} ${BIN_DIR}/*.sh ${USR_DIR}/bin
-	${RM} ${USR_DIR}/bin/autogen.sh
-	${MKDIR} ${DEST_DIR}
-	${CP} ${VAR_DIR}/*.php ${DEST_DIR}
+	${CP} ${BIN_DIR}/*.sh ${DEST_DIR}/bin
+	${RM} ${DEST_DIR}/bin/autogen.sh
+	${MKDIR} ${DEST_DIR}/var
+	${CP} ${VAR_DIR}/*.php ${DEST_DIR}/var
 	${CAT} ${VAR_DIR}/conf.php.template | ${SED} -e ${REPLACE_SED_STRING} \
 	       > ${DEST_DIR}/conf.php