diff --git a/src/doors/smurfcombat/smurf.c b/src/doors/smurfcombat/smurf.c
index 29e82ae9936af39ff18e4911c85106099b405ba4..04d29062e6fb962f6a65fe6f8832c1de6955c322 100644
--- a/src/doors/smurfcombat/smurf.c
+++ b/src/doors/smurfcombat/smurf.c
@@ -13,6 +13,7 @@
 /* */
 /***************************************************************************/
 
+#include"sockwrap.h"
 #include"smurfdef.h"
 #include"smurfdat.h"
 #include"smurfver.h"
@@ -135,8 +136,33 @@ char*   argv[100];
 	__CNV__main();
 	exit(0);
     }
-    if (argc > 1 && strnicmp(argv[1], "LOCAL", 5) == 0) {
-	od_control.od_force_local=TRUE;
+    if (argc > 1) {
+	int arg=1;
+
+	if(strnicmp(argv[arg], "LOCAL", 5) == 0) {
+		od_control.od_force_local=TRUE;
+		arg++;
+	}
+	if(argc >= arg) {
+		strcpy(od_control.info_path,argv[arg]);
+		if(isdir(argv[arg]))
+			strcat(od_control.info_path, DIRSEP_STR);
+		arg++;
+	}
+	if(argc >= arg) {
+		int type,len,got;
+		SOCKET sock;
+#ifdef _WIN32
+		WSADATA crap;
+		WSAStartup(0x0202, &crap);
+#endif
+
+		od_control.od_open_handle=atoi(argv[arg]);
+		sock=od_control.od_open_handle;
+		len=sizeof(type);
+		if((got=getsockopt(sock, SOL_SOCKET, SO_TYPE, (void *)&type, &len))==0 && type==SOCK_STREAM)
+			od_control.od_use_socket=TRUE;
+	}
     }
 #ifdef TODO_LOCAL_DISPLAY
     __mess(5);
diff --git a/src/doors/smurfcombat/smurf.doc b/src/doors/smurfcombat/smurf.doc
index 855f264fabb32ca2bdab474f34e93aa2b97fd055..8a1f9f14a6f85d118b76cebd67b21cd65c6796f0 100644
--- a/src/doors/smurfcombat/smurf.doc
+++ b/src/doors/smurfcombat/smurf.doc
@@ -52,6 +52,16 @@ Any checks or money orders MUST be addressed to 'CASH' or 'Laurence Maar'
  o         C:\BBS\SMURF\> smurf local                                       o
  o                                                                          o
  o                                                                          o
+ o STARTING FROM THE BBS                                                    o
+ o =====================                                                    o
+ o To start Smurf Combat as a door, use the folowing command-line:          o
+ o         C:\BBS\SMURF\> smurf [dropfile [handle]]                         o
+ o                                                                          o
+ o If no dropfile is specified, it will be loaded from the current          o
+ o directory.  If no handle is specified, t will be read from the dropfile  o
+ o (Currently, this is only available with door32.sys)                      o
+ o                                                                          o
+ o                                                                          o
  o STARTING A NEW GAME (REROLL)                                             o
  o ============================                                             o
  o Because i'm running outta time here, i'm NOT GOING TO TELL YOU HOW TO    o