Index: ipk/source/swapemus_oscam_4736/CONTROL/postinst
===================================================================
--- ipk/source/swapemus_oscam_4736/CONTROL/postinst	(revision 5776)
+++ ipk/source/swapemus_oscam_4736/CONTROL/postinst	(revision 6639)
@@ -6,13 +6,66 @@
 
 
-echo "Make Symlinks......."
-ln -s /var/swap/bin/oscam_4736 /var/bin/oscam_4736
-ln -s /var/swap/keys/oscam.conf /var/keys/oscam.conf
-ln -s /var/swap/keys/oscam.server /var/keys/oscam.server
-ln -s /var/swap/keys/oscam.services /var/keys/oscam.services
-ln -s /var/swap/keys/oscam.user /var/keys/oscam.user
-ln -s /var/swap/keys/oscam.dvbapi /var/keys/oscam.dvbapi
-ln -s /var/swap/keys/oscam.provid /var/keys/oscam.provid
-ln -s /var/swap/keys/oscam.srvid /var/keys/oscam.srvid
+if [ ! -e /var/swap/keys/oscam.conf ]; then
+	echo "use ipk config file: oscam.conf"
+	echo "rename /var/swap/keys/oscam.conf.oscam > /var/swap/keys/oscam.conf"
+	mv /var/swap/keys/oscam.conf.oscam /var/swap/keys/oscam.conf
+else
+	echo "found user config file: oscam.conf"
+	echo "skip ipk config file: oscam.conf.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.provid ]; then
+	echo "use ipk config file: oscam.provid"
+	echo "rename /var/swap/keys/oscam.provid.oscam > /var/swap/keys/oscam.provid"
+	mv /var/swap/keys/oscam.provid.oscam /var/swap/keys/oscam.provid
+else
+	echo "found user config file: oscam.conf"
+	echo "skip ipk config file: oscam.conf.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.srvid ]; then
+	echo "use ipk config file: oscam.srvid"
+	echo "rename /var/swap/keys/oscam.srvid.oscam > /var/swap/keys/oscam.srvid"
+	mv /var/swap/keys/oscam.srvid.oscam /var/swap/keys/oscam.srvid
+else
+	echo "found user config file: oscam.srvid"
+	echo "skip ipk config file: oscam.srvid.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.server ]; then
+	echo "use ipk config file: oscam.server"
+	echo "rename /var/swap/keys/oscam.server.oscam > /var/swap/keys/oscam.server"
+	mv /var/swap/keys/oscam.server.oscam /var/swap/keys/oscam.server
+else
+	echo "found user config file: oscam.server"
+	echo "skip ipk config file: oscam.server.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.user ]; then
+	echo "use ipk config file: oscam.user"
+	echo "rename /var/swap/keys/oscam.user.oscam > /var/swap/keys/oscam.user"
+	mv /var/swap/keys/oscam.user.oscam /var/swap/keys/oscam.user
+else
+	echo "found user config file: oscam.user"
+	echo "skip ipk config file: oscam.user.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.services ]; then
+	echo "use ipk config file: oscam.services"
+	echo "rename /var/swap/keys/oscam.services.oscam > /var/swap/keys/oscam.services"
+	mv /var/swap/keys/oscam.services.oscam /var/swap/keys/oscam.services
+else
+	echo "found user config file: oscam.services"
+	echo "skip ipk config file: oscam.services.oscam"
+fi
+
+if [ ! -e /var/swap/keys/oscam.dvbapi ]; then
+	echo "use ipk config file: oscam.dvbapi"
+	echo "rename /var/swap/keys/oscam.dvbapi.oscam > /var/swap/keys/oscam.dvbapi"
+	mv /var/swap/keys/oscam.dvbapi.oscam /var/swap/keys/oscam.dvbapi
+else
+	echo "found user config file: oscam.dvbapi"
+	echo "skip ipk config file: oscam.dvbapi.oscam"
+fi
 
 
Index: ipk/source/swapemus_oscam_4736/CONTROL/postrm
===================================================================
--- ipk/source/swapemus_oscam_4736/CONTROL/postrm	(revision 5776)
+++ ipk/source/swapemus_oscam_4736/CONTROL/postrm	(revision 6639)
@@ -4,50 +4,4 @@
 rm -r /var/swap/bin/oscam_4736
 
-if [ -e /var/swap/keys/oscam.conf.bak ]; then
-	echo "renaming your saved oscam.conf"
-	mv /var/swap/keys/oscam.conf.bak /var/swap/keys/oscam.conf
-fi
-
-if [ -e /var/swap/keys/oscam.provid.bak ]; then
-	echo "renaming your saved oscam.provid"
-	mv /var/swap/keys/oscam.provid.bak /var/swap/keys/oscam.provid
-fi
-
-if [ -e /var/swap/keys/oscam.srvid.bak ]; then
-	echo "renaming your saved oscam.srvid"
-	mv /var/swap/keys/oscam.srvid.bak /var/swap/keys/oscam.srvid
-fi
-
-if [ -e /var/swap/keys/oscam.dvbapi.bak ]; then
-	echo "renaming your saved oscam.dvbapi"
-	mv /var/swap/keys/oscam.dvbapi.bak /var/swap/keys/oscam.dvbapi
-fi
-
-if [ -e /var/swap/keys/oscam.server.bak ]; then
-	echo "renaming your saved oscam.server"
-	mv /var/swap/keys/oscam.server.bak /var/swap/keys/oscam.server
-fi
-
-if [ -e /var/swap/keys/oscam.services.bak ]; then
-	echo "renaming your saved oscam.services"
-	mv /var/swap/keys/oscam.services.bak /var/swap/keys/oscam.services
-fi
-
-if [ -e /var/swap/keys/oscam.user.bak ]; then
-	echo "renaming your saved oscam.user"
-	mv /var/swap/keys/oscam.user.bak /var/swap/keys/oscam.user
-fi
-
-echo "remove Symlinks"
-
-rm /var/bin/oscam_4736
-rm /var/keys/oscam.conf
-rm /var/keys/oscam.dvbapi
-rm /var/keys/oscam.provid
-rm /var/keys/oscam.srvid
-rm /var/keys/oscam.server
-rm /var/keys/oscam.user
-rm /var/keys/oscam.services
-
 echo "successfully removed"
 echo "syncing disk"
Index: ipk/source/swapemus_oscam_4736/CONTROL/preinst
===================================================================
--- ipk/source/swapemus_oscam_4736/CONTROL/preinst	(revision 5776)
+++ ipk/source/swapemus_oscam_4736/CONTROL/preinst	(revision 6639)
@@ -37,39 +37,4 @@
 fi
 
-if [ -e /var/swap/keys/oscam.conf ]; then
-	echo "saving your actual oscam.conf"
-	mv /var/swap/keys/oscam.conf /var/swap/keys/oscam.conf.bak
-fi
-
-if [ -e /var/swap/keys/oscam.provid ]; then
-	echo "saving your actual oscam.provid"
-	mv /var/swap/keys/oscam.provid /var/swap/keys/oscam.provid.bak
-fi
-
-if [ -e /var/swap/keys/oscam.srvid ]; then
-	echo "saving your actual oscam.srvid"
-	mv /var/swap/keys/oscam.srvid /var/swap/keys/oscam.srvid.bak
-fi
-
-if [ -e /var/swap/keys/oscam.dvbapi ]; then
-	echo "saving your actual oscam.dvbapi"
-	mv /var/swap/keys/oscam.dvbapi /var/swap/keys/oscam.dvbapi.bak
-fi
-
-if [ -e /var/swap/keys/oscam.server ]; then
-	echo "saving your actual oscam.server"
-	mv /var/swap/keys/oscam.server /var/swap/keys/oscam.server.bak
-fi
-
-if [ -e /var/swap/keys/oscam.user ]; then
-	echo "saving your actual oscam.user"
-	mv /var/swap/keys/oscam.user /var/swap/keys/oscam.user.bak
-fi
-
-if [ -e /var/swap/keys/oscam.services ]; then
-	echo "saving your actual oscam.services"
-	mv /var/swap/keys/oscam.services /var/swap/keys/oscam.services.bak
-fi
-
 sync
 
Index: ipk/source/swapemus_oscam_4736/CONTROL/prerm
===================================================================
--- ipk/source/swapemus_oscam_4736/CONTROL/prerm	(revision 5776)
+++ ipk/source/swapemus_oscam_4736/CONTROL/prerm	(revision 6639)
@@ -2,4 +2,40 @@
 TMP=/tmp/.oscam
 echo "syncing disk"
+
+if [ ! -e /var/swap/keys/oscam.conf.oscam ]; then
+	echo "remove ipk oscam.conf"
+	rm /var/swap/keys/oscam.conf
+fi
+
+if [ ! -e /var/swap/keys/oscam.provid.oscam ]; then
+	echo "remove ipk oscam.provid"
+	rm /var/swap/keys/oscam.provid
+fi
+
+if [ ! -e /var/swap/keys/oscam.srvid.oscam ]; then
+	echo "remove ipk oscam.srvid"
+	rm /var/swap/keys/oscam.srvid
+fi
+
+if [ ! -e /var/swap/keys/oscam.server.oscam ]; then
+	echo "remove ipk oscam.server"
+	rm /var/swap/keys/oscam.server
+fi
+
+if [ ! -e /var/swap/keys/oscam.user.oscam ]; then
+	echo "remove ipk oscam.user"
+	rm /var/swap/keys/oscam.user
+fi
+
+if [ ! -e /var/swap/keys/oscam.services.oscam ]; then
+	echo "remove ipk oscam.services"
+	rm /var/swap/keys/oscam.services
+fi
+
+if [ ! -e /var/swap/keys/oscam.dvbapi.oscam ]; then
+	echo "remove ipk oscam.dvbapi"
+	rm /var/swap/keys/oscam.dvbapi
+fi
+
 sync
 echo "Removing Oscam 4736 from Swapstick"