diff --git a/campcaster/etc/debian/campcaster-station.postinst b/campcaster/etc/debian/campcaster-station.postinst
index fcae62071..0dba7d830 100644
--- a/campcaster/etc/debian/campcaster-station.postinst
+++ b/campcaster/etc/debian/campcaster-station.postinst
@@ -21,6 +21,17 @@ installdir=/opt/campcaster
 
 case "$1" in
     configure)
+        if [ -f $installdir/storageServer.wasMounted ]; then
+            storagedir=$installdir/var/Campcaster/storageServer
+            if [ -d $storagedir.bak ]; then
+                rm -rf $storagedir.bak
+            fi
+            mv -f $storagedir $storagedir.bak
+            mkdir $storagedir
+            mount $storagedir
+            rm $installdir/storageServer.wasMounted
+        fi
+        
         # do post-installation configuration
         $installdir/bin/postInstallStation.sh --directory=$installdir \
                         --apache-group=www-data \
diff --git a/campcaster/etc/debian/campcaster-station.postrm b/campcaster/etc/debian/campcaster-station.postrm
index 698c20023..1f08bff69 100644
--- a/campcaster/etc/debian/campcaster-station.postrm
+++ b/campcaster/etc/debian/campcaster-station.postrm
@@ -70,11 +70,9 @@ case "$1" in
         rm -rf $installdir/var/Campcaster/archiveServer/var/stor/*
 
         storagedir=$installdir/var/Campcaster/storageServer
-        storage_is_local=yes
-        if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then
-            storage_is_local=no
-        fi
-        if [ "$storage_is_local" = "yes" ]; then
+        if [ -f $installdir/storageServer.wasMounted ]; then
+            rmdir $storagedir
+        else
             rm -rf $storagedir/var/stor/*
         fi
     ;;
diff --git a/campcaster/etc/debian/campcaster-station.prerm b/campcaster/etc/debian/campcaster-station.prerm
index b31b9f626..c33f4e8d3 100644
--- a/campcaster/etc/debian/campcaster-station.prerm
+++ b/campcaster/etc/debian/campcaster-station.prerm
@@ -80,11 +80,10 @@ case "$1" in
         rm -rf $installdir/var/Campcaster/archiveServer/var/trans/*
 
         storagedir=$installdir/var/Campcaster/storageServer
-        storage_is_local=yes
         if [ "`mount | grep -o \"on $storagedir \"`" = "on $storagedir " ]; then
-            storage_is_local=no
-        fi
-        if [ "$storage_is_local" = "yes" ]; then
+            umount $storagedir
+            touch $installdir/storageServer.wasMounted
+        else
             rm -rf $storagedir/var/access/*
             rm -rf $storagedir/var/trans/*
         fi