diff --git a/common/loader.c b/common/loader.c
index 788d36dd..8e58a225 100644
--- a/common/loader.c
+++ b/common/loader.c
@@ -18,7 +18,7 @@
  * Mark Hessling  M.Hessling@qut.edu.au  http://www.lightlink.com/hessling/
  */
 
-static char RCSid[] = "$Id: loader.c,v 1.3 2002/03/24 09:55:22 mark Exp $";
+static char RCSid[] = "$Id: loader.c,v 1.4 2002/07/06 10:58:06 mark Exp $";
 
 #include "rxpack.h"
 
@@ -214,6 +214,11 @@ int main
     */
    if ( ( rc = RegisterRxFunctions( ) ) != 0 )
       return( rc );
+   /* 
+    * Register a default subcommand handler to pass commands to the OS
+    */
+   if ( ( rc = RegisterRxSubcom( ) ) != 0 )
+      return( rc );
    FunctionPrologue( RxPackageName, 0L, NULL );
    /*
     * Set up the system exit for the Say and Trace redirection
diff --git a/common/rxpack.c b/common/rxpack.c
index 814dbaf1..69d2fc82 100644
--- a/common/rxpack.c
+++ b/common/rxpack.c
@@ -16,7 +16,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-static char RCSid[] = "$Id: rxpack.c,v 1.5 2002/03/24 09:55:23 mark Exp $";
+static char RCSid[] = "$Id: rxpack.c,v 1.6 2002/07/06 10:58:06 mark Exp $";
 
 #include "rxpack.h"
 
@@ -26,6 +26,12 @@ RxPackageGlobalDataDef *RxPackageGlobalData=NULL;
 RexxExitHandler RxExitHandlerForSayTraceRedirection;
 #endif
 
+#if defined(USE_REXX6000)
+LONG RxSubcomHandler( RSH_ARG0_TYPE, RSH_ARG1_TYPE, RSH_ARG2_TYPE );
+#else
+RexxSubcomHandler RxSubcomHandler;
+#endif
+
 extern RexxFunction RxPackageFunctions[];
 
 #if !defined(HAVE_STRERROR)
@@ -652,6 +658,36 @@ void RxDisplayError
 }
 
 
+/*-----------------------------------------------------------------------------
+ * This function registers the default subcommand handler...
+ *----------------------------------------------------------------------------*/
+int RegisterRxSubcom
+
+#ifdef HAVE_PROTO
+   ( void )
+#else
+   ( )
+#endif
+
+{
+   ULONG rc=0L;
+
+   InternalTrace( "RegisterRxSubcom", NULL );
+
+#if defined(USE_REXX6000)
+   rc = RexxRegisterSubcom( (RRSE_ARG0_TYPE)RxPackageName,
+                            (RRSE_ARG1_TYPE)RxSubcomHandler,
+                            (RRSE_ARG2_TYPE)NULL );
+#else
+   rc = RexxRegisterSubcomExe( (RRSE_ARG0_TYPE)RxPackageName,
+                               (RRSE_ARG1_TYPE)RxSubcomHandler,
+                               (RRSE_ARG2_TYPE)NULL );
+#endif
+   if ( rc != RXSUBCOM_OK )
+      return 1;
+   return 0;
+}
+
 /*-----------------------------------------------------------------------------
  * This function registers the external functions...
  *----------------------------------------------------------------------------*/
@@ -853,6 +889,13 @@ int TermRxPackage
     */
    if ( ( rc = TerminatePackage( ) ) != 0 )
       return (int)FunctionEpilogue( "TermRxPackage", (long)rc );
+#if defined(USE_REXX6000)
+   rc = RexxDeregisterSubcom( RDS_ARG0_TYPE)RxPackageName );
+#else
+   rc = RexxDeregisterSubcom( (RDS_ARG0_TYPE)RxPackageName,
+                              (RDS_ARG1_TYPE)NULL );
+#endif
+
 #if !defined(DYNAMIC_LIBRARY) && (defined(USE_WINREXX) || defined(USE_QUERCUS))
    RexxDeregisterExit( ( RDE_ARG0_TYPE )RxPackageName,
                        ( RDE_ARG1_TYPE )NULL );
@@ -1232,6 +1275,61 @@ REH_RETURN_TYPE RxExitHandlerForSayTraceRedirection
    return rc;
 }
 
+/***********************************************************************/
+RSH_RETURN_TYPE RxSubcomHandler
+
+#if defined(HAVE_PROTO)
+   (
+   RSH_ARG0_TYPE Command,    /* Command string passed from the caller    */
+   RSH_ARG1_TYPE Flags,      /* pointer to short for return of flags     */
+   RSH_ARG2_TYPE Retstr)     /* pointer to RXSTRING for RC return        */
+#else
+   ( Command, Flags, Retstr )
+   RSH_ARG0_TYPE Command;    /* Command string passed from the caller    */
+   RSH_ARG1_TYPE Flags;      /* pointer to short for return of flags     */
+   RSH_ARG2_TYPE Retstr;     /* pointer to RXSTRING for RC return        */
+#endif
+/***********************************************************************/
+{
+   RSH_RETURN_TYPE rcode=0;
+   int rc;
+   char *buf;
+   /*
+    * Set the Flags variable to RXSUBCOM_DUP. If this value is still
+    * this after we call the user-supplied subcom handler, we use
+    * our default.
+    */
+   *Flags = RXSUBCOM_DUP;
+   rcode = PackageSubcomHandler( Command, Flags, Retstr );
+   if ( *Flags == RXSUBCOM_DUP  )
+   {
+      buf = malloc( Command->strlength + 1 );
+      if ( buf == NULL )
+      {
+         *Flags = RXSUBCOM_ERROR;             /* raise an error condition   */
+         sprintf(Retstr->strptr, "%d", rc);   /* format return code string  */
+                                              /* and set the correct length */
+         Retstr->strlength = strlen(Retstr->strptr);
+      }
+      else
+      {
+         memcpy( buf, Command->strptr, Command->strlength );
+         buf[Command->strlength] = '\0';
+         rc = system( buf );
+         free( buf );
+         if (rc < 0)
+            *Flags = RXSUBCOM_ERROR;             /* raise an error condition   */
+         else
+            *Flags = RXSUBCOM_OK;                /* not found is not an error  */
+      
+         sprintf(Retstr->strptr, "%d", rc); /* format return code string  */
+                                                 /* and set the correct length */
+         Retstr->strlength = strlen(Retstr->strptr);
+      }
+   }
+   return rcode;                              /* processing completed       */
+}
+
 /*
  * Both WinRexx and Personal Rexx load and unload this DLL before and
  * after each call to an external function. If this DLL is not resident
diff --git a/common/rxpack.h b/common/rxpack.h
index 0b161f85..8fe6ec22 100644
--- a/common/rxpack.h
+++ b/common/rxpack.h
@@ -91,17 +91,20 @@
 #  define INCL_RXSHV      /* Shared variable support */
 #  define INCL_RXFUNC     /* External functions support */
 #  define INCL_RXSYSEXIT  /* System exit routines */
+#  define INCL_RXSUBCOM   /* Subcommand routines */
 #  include <os2.h>
 # else
 #  include <os2.h>
 #  define INCL_RXSHV      /* Shared variable support */
 #  define INCL_RXFUNC     /* External functions support */
 #  define INCL_RXSYSEXIT  /* System exit routines */
+#  define INCL_RXSUBCOM   /* Subcommand routines */
 # endif
 #else
 # define INCL_RXSHV      /* Shared variable support */
 # define INCL_RXFUNC     /* External functions support */
 # define INCL_RXSYSEXIT  /* System exit routines */
+# define INCL_RXSUBCOM   /* Subcommand routines */
 #endif
 
 /*
@@ -221,6 +224,7 @@ int RxReturnDouble( RXSTRING *, double );
 int RxReturnPointer( RXSTRING *, void * );
 int memcmpi( char *, char *, int );
 int my_checkparam(const char *, int, int, int);
+RSH_RETURN_TYPE PackageSubcomHandler( RSH_ARG0_TYPE, RSH_ARG1_TYPE, RSH_ARG2_TYPE );
 #else
 void FunctionPrologue( );
 void FunctionTrace( );
@@ -254,6 +258,7 @@ int RxReturnNumber( );
 int RxReturnDouble( );
 int memcmpi( );
 int my_checkparam( );
+RSH_RETURN_TYPE PackageSubcomHandler( );
 #endif
 
 #ifdef DEBUG