diff --git a/src/freedombone b/src/freedombone
index ba952c2f..b8148806 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -10002,7 +10002,7 @@ function install_media_server {
 		echo $'No data directory found'
 		exit 625728
 	fi
-	cp -a $MEDIA_SERVER_WORKING_DIRECTORY/data $MEDIA_SERVER_WORKING_DIRECTORY
+	cp -r $MEDIA_SERVER_WORKING_DIRECTORY/data/* $MEDIA_SERVER_WORKING_DIRECTORY
 	paster setup-app deployment.ini
 
 	# add uwsgi to deployment.ini
@@ -10022,8 +10022,8 @@ function install_media_server {
 	# script to be called by the daemon
 	echo '#!/bin/bash' > /usr/bin/start-mediadrop
 	echo "cd ${MEDIA_SERVER_WORKING_DIRECTORY}" >> /usr/bin/start-mediadrop
-	echo "uwsgi --ini-paste deployment.ini" >> /usr/bin/start-mediadrop
-	echo "paster serve --reload deployment.ini" >> /usr/bin/start-mediadrop
+	echo "${MEDIA_SERVER_WORKING_DIRECTORY}/deployment-scripts/uwsgi --ini-paste ${MEDIA_SERVER_BASE_DIRECTORY}/deployment.ini" >> /usr/bin/start-mediadrop
+	echo "${MEDIA_SERVER_BASE_DIRECTORY}/venv/bin/paster serve --reload ${MEDIA_SERVER_BASE_DIRECTORY}/deployment.ini" >> /usr/bin/start-mediadrop
 	chmod +x /usr/bin/start-mediadrop
 
 	# create daemon