diff --git a/game/manage.py b/game/manage.py
index 88f9789139..84c37286f9 100755
--- a/game/manage.py
+++ b/game/manage.py
@@ -13,7 +13,7 @@ basic stuff.
 if not os.path.exists('settings.py'):
     print "Can't find a settings.py file, creating one for you."
     f = open('settings.py', 'w')
-    f.write('"""\rMaster server configuration file. You may override any of the values in the\rsrc/config_defaults.py here. Copy-paste the variables here, and make changes to\rthis file rather than editing config_defaults.py directly.\r"""\r')
+    f.write('"""\nMaster server configuration file. You may override any of the values in the\nsrc/config_defaults.py here. Copy-paste the variables here, and make changes to\nthis file rather than editing config_defaults.py directly.\n"""\n')
     f.write('from src.config_defaults import *')
 
 try:
diff --git a/game/startup.sh b/game/startup.sh
index 21e68f7336..533ead751d 100644
--- a/game/startup.sh
+++ b/game/startup.sh
@@ -14,10 +14,9 @@
 
 init () {
 	## Sets environmental variables and preps the logs.
-	export PYTHON_PATH=".."
+	export PYTHONPATH="..":$PYTHONPATH
 	export DJANGO_SETTINGS_MODULE="game.settings"
-	GAME_DIR=`python -c "import settings; print settings.GAME_DIR"`
-	mv -f $GAME_DIR/logs/evennia.log $GAME_DIR/logs/evennia.logs.old
+	mv -f logs/evennia.log logs/evennia.logs.old
 }
 
 startup_interactive() {