diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp
index 79d7ebf..b64725d 100644
--- a/src/misc/cross.cpp
+++ b/src/misc/cross.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: cross.cpp,v 1.5 2009/03/14 18:02:34 qbix79 Exp $ */
+/* $Id: cross.cpp,v 1.7 2009/05/26 17:43:39 qbix79 Exp $ */
 
 #include "dosbox.h"
 #include "cross.h"
@@ -40,12 +40,28 @@
 #include <pwd.h>
 #endif
 
+#ifdef WIN32
+static void W32_ConfDir(std::string& in,bool create) {
+	int c = create?1:0;
+	char result[MAX_PATH] = { 0 };
+	BOOL r = SHGetSpecialFolderPath(NULL,result,CSIDL_LOCAL_APPDATA,c);
+	if(!r || result[0] == 0) r = SHGetSpecialFolderPath(NULL,result,CSIDL_APPDATA,c);
+	if(!r || result[0] == 0) {
+		char const * windir = getenv("windir");
+		if(!windir) windir = "c:\\windows";
+		safe_strncpy(result,windir,MAX_PATH);
+		char const* appdata = "\\Application Data";
+		size_t len = strlen(result);
+		if(len + strlen(appdata) < MAX_PATH) strcat(result,appdata);
+		if(create) mkdir(result);
+	}
+	in = result;
+}
+#endif
 
 void Cross::GetPlatformConfigDir(std::string& in) {
 #ifdef WIN32
-	char result[MAX_PATH] = { 0 };
-	SHGetSpecialFolderPath(NULL,result,CSIDL_LOCAL_APPDATA,0);
-	in = result;
+	W32_ConfDir(in,false);
 	in += "\\DOSBox";
 #elif defined(MACOSX)
 	in = "~/Library/Preferences";
@@ -74,9 +90,7 @@ void Cross::GetPlatformConfigName(std::string& in) {
 
 void Cross::CreatePlatformConfigDir(std::string& in) {
 #ifdef WIN32
-	char result[MAX_PATH] = { 0 };
-	SHGetSpecialFolderPath(NULL,result,CSIDL_LOCAL_APPDATA,1); //1 at end is create
-	in = result;
+	W32_ConfDir(in,true);
 	in += "\\DOSBox";
 	mkdir(in.c_str());
 #elif defined(MACOSX)
@@ -86,7 +100,6 @@ void Cross::CreatePlatformConfigDir(std::string& in) {
 #elif defined(HW_RVL)
 	in = "sd:/DOSBox";
 	CreateDir(in);
-	//Don't create it. Assume it exists
 #else
 	in = "~/.dosbox";
 	ResolveHomedir(in);
@@ -132,8 +145,8 @@ dir_information* open_directory(const char* dirname) {
 
 	safe_strncpy(dir.base_path,dirname,MAX_PATH);
 
-	if (dirname[len-1]=='\\')	strcat(dir.base_path,"*.*");
-	else						strcat(dir.base_path,"\\*.*");
+	if (dirname[len-1] == '\\') strcat(dir.base_path,"*.*");
+	else                        strcat(dir.base_path,"\\*.*");
 
 	dir.handle = INVALID_HANDLE_VALUE;
 
diff --git a/src/misc/messages.cpp b/src/misc/messages.cpp
index f46ab49..37750cc 100644
--- a/src/misc/messages.cpp
+++ b/src/misc/messages.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: messages.cpp,v 1.21 2009/02/01 14:18:12 qbix79 Exp $ */
+/* $Id: messages.cpp,v 1.22 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/misc/programs.cpp b/src/misc/programs.cpp
index f145d26..d8bfa3c 100644
--- a/src/misc/programs.cpp
+++ b/src/misc/programs.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: programs.cpp,v 1.36 2009/03/23 10:55:36 qbix79 Exp $ */
+/* $Id: programs.cpp,v 1.37 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include <vector>
 #include <ctype.h>
diff --git a/src/misc/setup.cpp b/src/misc/setup.cpp
index 40263ce..00c4125 100644
--- a/src/misc/setup.cpp
+++ b/src/misc/setup.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: setup.cpp,v 1.55 2009/03/11 20:18:37 qbix79 Exp $ */
+/* $Id: setup.cpp,v 1.56 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include "dosbox.h"
 #include "cross.h"
diff --git a/src/misc/support.cpp b/src/misc/support.cpp
index d016151..ec72bea 100644
--- a/src/misc/support.cpp
+++ b/src/misc/support.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: support.cpp,v 1.36 2009/04/25 16:25:03 harekiet Exp $ */
+/* $Id: support.cpp,v 1.37 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include <string.h>
 #include <stdlib.h>
diff --git a/src/platform/visualc/Makefile.am b/src/platform/visualc/Makefile.am
index e41446c..4a7bbe8 100644
--- a/src/platform/visualc/Makefile.am
+++ b/src/platform/visualc/Makefile.am
@@ -1 +1 @@
-EXTRA_DIST = dirent.c dirent.h unistd.h config.h ntddscsi.h ntddcdrm.h
+EXTRA_DIST = unistd.h config.h ntddscsi.h ntddcdrm.h
diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h
index d1c9bbb..0bfef95 100644
--- a/src/platform/visualc/config.h
+++ b/src/platform/visualc/config.h
@@ -1,4 +1,4 @@
-#define VERSION "0.72"
+#define VERSION "0.73"
 
 /* Define to 1 to enable internal debugger, requires libcurses */
 #define C_DEBUG 0
diff --git a/src/shell/shell.cpp b/src/shell/shell.cpp
index d92f34d..857ded2 100644
--- a/src/shell/shell.cpp
+++ b/src/shell/shell.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell.cpp,v 1.98 2009/03/23 10:55:36 qbix79 Exp $ */
+/* $Id: shell.cpp,v 1.99 2009/05/14 18:44:54 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <stdarg.h>
@@ -166,9 +166,9 @@ Bitu DOS_Shell::GetRedirection(char *s, char **ifn, char **ofn,bool * append) {
 			while (*lr && *lr!=' ') lr++;
 			//if it ends on a : => remove it.
 			if((*ofn != lr) && (lr[-1] == ':')) lr[-1] = 0;
-			if(*lr && *(lr+1))
-				*lr++=0;
-			else
+			if(*lr && *(lr+1)) 
+				*lr++=0; 
+			else 
 				*lr=0;
 			*ofn=strdup(*ofn);
 			continue;
@@ -178,9 +178,9 @@ Bitu DOS_Shell::GetRedirection(char *s, char **ifn, char **ofn,bool * append) {
 			*ifn=lr;
 			while (*lr && *lr!=' ') lr++;
 			if((*ifn != lr) && (lr[-1] == ':')) lr[-1] = 0;
-			if(*lr && *(lr+1))
-				*lr++=0;
-			else
+			if(*lr && *(lr+1)) 
+				*lr++=0; 
+			else 
 				*lr=0;
 			*ifn=strdup(*ifn);
 			continue;
@@ -192,7 +192,7 @@ Bitu DOS_Shell::GetRedirection(char *s, char **ifn, char **ofn,bool * append) {
 	}
 	*lw=0;
 	return num;
-}
+}	
 
 void DOS_Shell::ParseLine(char * line) {
 	LOG(LOG_EXEC,LOG_ERROR)("Parsing command line: %s",line);
@@ -201,7 +201,7 @@ void DOS_Shell::ParseLine(char * line) {
 	line = trim(line);
 
 	/* Do redirection and pipe checks */
-
+	
 	char * in  = 0;
 	char * out = 0;
 
@@ -211,12 +211,12 @@ void DOS_Shell::ParseLine(char * line) {
 	bool append;
 	bool normalstdin  = false;	/* wether stdin/out are open on start. */
 	bool normalstdout = false;	/* Bug: Assumed is they are "con"      */
-
+	
 	num = GetRedirection(line,&in, &out,&append);
 	if (num>1) LOG_MSG("SHELL:Multiple command on 1 line not supported");
 	if (in || out) {
-		normalstdin  = (psp->GetFileHandle(0) != 0xff);
-		normalstdout = (psp->GetFileHandle(1) != 0xff);
+		normalstdin  = (psp->GetFileHandle(0) != 0xff); 
+		normalstdout = (psp->GetFileHandle(1) != 0xff); 
 	}
 	if (in) {
 		if(DOS_OpenFile(in,OPEN_READ,&dummy)) {	//Test if file exists
@@ -241,7 +241,7 @@ void DOS_Shell::ParseLine(char * line) {
 		} else {
 			status = DOS_OpenFileExtended(out,OPEN_READWRITE,DOS_ATTR_ARCHIVE,0x12,&dummy,&dummy2);
 		}
-
+		
 		if(!status && normalstdout) DOS_OpenFile("con",OPEN_READWRITE,&dummy); //Read only file, open con again
 		if(!normalstdin && !in) DOS_CloseFile(0);
 	}
@@ -267,7 +267,7 @@ void DOS_Shell::ParseLine(char * line) {
 void DOS_Shell::RunInternal(void)
 {
 	char input_line[CMD_MAXLINE] = {0};
-	while(bf && bf->ReadLine(input_line))
+	while(bf && bf->ReadLine(input_line)) 
 	{
 		if (echo) {
 				if (input_line[0] != '@') {
@@ -375,8 +375,8 @@ public:
 		/* Check for first command being a directory or file */
 		char buffer[CROSS_LEN];
 		char cross_filesplit[2] = {CROSS_FILESPLIT , 0};
-		/* Combining -securemode and no parameter leaves you with a lovely Z:\. */
-		if ( !control->cmdline->FindCommand(1,line) ) {
+		/* Combining -securemode and no parameter leaves you with a lovely Z:\. */ 
+		if ( !control->cmdline->FindCommand(1,line) ) { 
 			if ( secure ) autoexec[12].Install("z:\\config.com -securemode");
 		} else {
 			struct stat test;
@@ -387,13 +387,13 @@ public:
 				strcat(buffer,line.c_str());
 				if (stat(buffer,&test)) goto nomount;
 			}
-			if (test.st_mode & S_IFDIR) {
+			if (test.st_mode & S_IFDIR) { 
 				autoexec[12].Install(std::string("MOUNT C \"") + buffer + "\"");
 				autoexec[13].Install("C:");
 				if(secure) autoexec[14].Install("z:\\config.com -securemode");
 			} else {
 				char* name = strrchr(buffer,CROSS_FILESPLIT);
-				if (!name) { //Only a filename
+				if (!name) { //Only a filename 
 					line = buffer;
 					getcwd(buffer,CROSS_LEN);
 					strcat(buffer,cross_filesplit);
@@ -534,7 +534,7 @@ void SHELL_Init() {
 	);
 	MSG_Add("SHELL_STARTUP_END",
 	        "\xBA \033[32mHAVE FUN!\033[37m                                                          \xBA\n"
-	        "\xBA \033[32mThe DOSBox Team\033[37m                                                    \xBA\n"
+	        "\xBA \033[32mThe DOSBox Team \033[33mhttp://www.dosbox.com\033[37m                              \xBA\n"
 	        "\xC8\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
 	        "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD"
 	        "\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xCD\xBC\033[0m\n"
@@ -623,7 +623,7 @@ void SHELL_Init() {
 	envmcb.SetPSPSeg(psp_seg);	// MCB of the command shell environment
 	envmcb.SetSize(0x28);
 	envmcb.SetType(0x4d);
-
+	
 	/* Setup environment */
 	PhysPt env_write=PhysMake(env_seg,0);
 	MEM_BlockWrite(env_write,path_string,(Bitu)(strlen(path_string)+1));
@@ -638,7 +638,7 @@ void SHELL_Init() {
 	DOS_PSP psp(psp_seg);
 	psp.MakeNew(0);
 	dos.psp(psp_seg);
-
+   
 	/* The start of the filetable in the psp must look like this:
 	 * 01 01 01 00 02
 	 * In order to achieve this: First open 2 files. Close the first and
@@ -660,14 +660,13 @@ void SHELL_Init() {
 	tail.count=(Bit8u)strlen(init_line);
 	strcpy(tail.buffer,init_line);
 	MEM_BlockWrite(PhysMake(psp_seg,128),&tail,128);
-
+	
 	/* Setup internal DOS Variables */
 	dos.dta(RealMake(psp_seg,0x80));
 	dos.psp(psp_seg);
 
-
+	
 	SHELL_ProgramStart(&first_shell);
-
 	first_shell->Run();
 	delete first_shell;
 	first_shell = 0;//Make clear that it shouldn't be used anymore
diff --git a/src/shell/shell_batch.cpp b/src/shell/shell_batch.cpp
index 78c0a1d..8c16504 100644
--- a/src/shell/shell_batch.cpp
+++ b/src/shell/shell_batch.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_batch.cpp,v 1.34 2009/04/22 12:28:51 qbix79 Exp $ */
+/* $Id: shell_batch.cpp,v 1.35 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/shell/shell_misc.cpp b/src/shell/shell_misc.cpp
index e1eb505..8ebedae 100644
--- a/src/shell/shell_misc.cpp
+++ b/src/shell/shell_misc.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2008  The DOSBox Team
+ *  Copyright (C) 2002-2009  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: shell_misc.cpp,v 1.53 2008/09/07 10:55:16 c2woody Exp $ */
+/* $Id: shell_misc.cpp,v 1.54 2009/05/27 09:15:42 qbix79 Exp $ */
 
 #include <stdlib.h>
 #include <string.h>