diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index bc5acbbc58..7bae5daaa7 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -8,6 +8,14 @@
    2002-12-01 23:12 UTC+0100 Foo Bar <foo.bar@foobar.org>
 */
 
+2003-09-29 16:12 UTC-0800 Luis Krause Mantilla <lkrausem@shaw.ca>
+  * contrib/rdd_ads/adsfunc.c
+  * contrib/rdd_ads/doc/en/adsfuncs.txt
+    + Added 2 (ignored) & 3rd params to adsKeyNo() in order to perform
+      like OrdKeyNo() for other RDD's.  The default remains ADS_IGNOREFILTERS
+      for compatibility (like adsKeyCount() does).
+      Updated documentation in adsfuncs.txt
+
 2003-09-29 22:10 UTC+0300 Alexander Kresin <alex@belacy.belgorod.su>
    *source/rtl/strcase.c
      ! hb_strncpyUpperTrim() is fixed ( borrowed from xHarbour ).
diff --git a/harbour/contrib/rdd_ads/adsfunc.c b/harbour/contrib/rdd_ads/adsfunc.c
index 669e43b751..5b9b8460cf 100644
--- a/harbour/contrib/rdd_ads/adsfunc.c
+++ b/harbour/contrib/rdd_ads/adsfunc.c
@@ -354,10 +354,22 @@ HB_FUNC( ADSKEYNO )
    UNSIGNED8 ordNum;
    UNSIGNED32 pulKey;
    ADSHANDLE hIndex;
+   UNSIGNED16 usFilterOption = ADS_IGNOREFILTERS;
 
    pArea = (ADSAREAP) hb_rddGetCurrentWorkAreaPointer();
    if( pArea )
    {
+      if( hb_pcount() > 2 )             /* 2nd parameter: unsupported Bag Name */
+      {
+         if( ISNUM( 3 ) )
+            usFilterOption = hb_parni( 3 );
+         else
+         {
+            hb_errRT_DBCMD( EG_ARG, 1014, NULL, "ADSKEYNO" );
+            return;
+         }
+      }
+
       if( hb_pcount() > 0 )
       {
          if( ISNUM( 1 ) )
@@ -370,17 +382,17 @@ HB_FUNC( ADSKEYNO )
             ordName = (UNSIGNED8*)hb_parc( 1 );
             AdsGetIndexHandle( pArea->hTable, ordName, &hIndex );
          }
-         AdsGetKeyNum  ( hIndex, ADS_IGNOREFILTERS, &pulKey);
+         AdsGetKeyNum( hIndex, usFilterOption, &pulKey );
       }
       else
       {
-         if( pArea->hOrdCurrent != 0)
+         if( pArea->hOrdCurrent != 0 )
          {
             hIndex = pArea->hOrdCurrent;
-            AdsGetKeyNum  ( hIndex, ADS_IGNOREFILTERS, &pulKey);
+            AdsGetKeyNum( hIndex, usFilterOption, &pulKey );
          }
          else
-            AdsGetRecordNum  ( pArea->hTable, ADS_IGNOREFILTERS, &pulKey);
+            AdsGetRecordNum( pArea->hTable, usFilterOption, &pulKey );
       }
 
       hb_retnl( pulKey );
@@ -397,7 +409,7 @@ HB_FUNC( ADSKEYCOUNT )
    UNSIGNED32 pulKey;
    ADSHANDLE  hIndex;
    UNSIGNED16 usFilterOption = ADS_IGNOREFILTERS;
-   UNSIGNED8  pucScope[ ADS_MAX_KEY_LENGTH+1 ];
+   UNSIGNED8  pucScope[ ADS_MAX_KEY_LENGTH+1];
    UNSIGNED8  pucFilter[HARBOUR_MAX_RDD_FILTER_LENGTH+1];
    UNSIGNED16 pusBufLen = ADS_MAX_KEY_LENGTH+1;
 
@@ -409,18 +421,18 @@ HB_FUNC( ADSKEYCOUNT )
          ordNum = hb_parni( 1 );
          AdsGetIndexHandleByOrder( pArea->hTable, ordNum, &hIndex );
       }
-      else if(ISCHAR( 1 ))
+      else if( ISCHAR( 1 ) )
       {
          ordName = (UNSIGNED8*)hb_parc( 1 );
          AdsGetIndexHandle( pArea->hTable, ordName, &hIndex );
       }
-      else if(! ISNIL( 1 ))
+      else if( ! ISNIL( 1 ) )
       {
          hb_errRT_DBCMD( EG_ARG, 1014, NULL, "ADSKEYCOUNT" );
          return;
       }
       else
-         hIndex = (pArea->hOrdCurrent == 0) ? pArea->hTable : pArea->hOrdCurrent;
+         hIndex = ( pArea->hOrdCurrent == 0 ) ? pArea->hTable : pArea->hOrdCurrent;
 
       if( hb_pcount() > 2 )             /* 2nd parameter: unsupported Bag Name */
       {
@@ -439,7 +451,7 @@ HB_FUNC( ADSKEYCOUNT )
          AdsGetRecordCount( hIndex, ADS_IGNOREFILTERS, &pulKey );
       else            /* ads scope handling is flawed; do our own */
       {               /* One more optimization would be to check if there's a fully optimized AOF available so don't walk ours */
-         AdsGetScope  ( hIndex, ADS_BOTTOM, pucScope, &pusBufLen);
+         AdsGetScope( hIndex, ADS_BOTTOM, pucScope, &pusBufLen );
          if ( pusBufLen )                // had a scope
          {
             AdsGetAOF( pArea->hTable, pucFilter, &pusBufLen );
@@ -449,7 +461,7 @@ HB_FUNC( ADSKEYCOUNT )
             {
                AdsGetRecordNum( pArea->hTable, ADS_IGNOREFILTERS,
                      (UNSIGNED32 *)&(pArea->ulRecNo) );
-               AdsGotoTop  ( hIndex );
+               AdsGotoTop( hIndex );
                AdsAtEOF( pArea->hTable, (UNSIGNED16 *)&(pArea->fEof) );
 
                while ( AdsSkip ( hIndex, 1 ) != AE_NO_CURRENT_RECORD && !pArea->fEof )
@@ -464,7 +476,7 @@ HB_FUNC( ADSKEYCOUNT )
                AdsGetRecordCount( hIndex, usFilterOption, &pulKey );
          }
          else                           /*  no scope set */
-            AdsGetRecordCount  ( hIndex, usFilterOption, &pulKey);
+            AdsGetRecordCount( hIndex, usFilterOption, &pulKey );
 
       }
 
diff --git a/harbour/contrib/rdd_ads/doc/en/adsfuncs.txt b/harbour/contrib/rdd_ads/doc/en/adsfuncs.txt
index a76114f136..b497404a7c 100644
--- a/harbour/contrib/rdd_ads/doc/en/adsfuncs.txt
+++ b/harbour/contrib/rdd_ads/doc/en/adsfuncs.txt
@@ -476,7 +476,7 @@
  *      a particular Index File in cases where two files are open that contain
  *      orders with the same name. The ADS driver does not support this and
  *      will select the first order with the requested name. To stay consistent
- *      with other RDDs, therefore(),the second parameter is reserved and the
+ *      with other RDDs, therefore, the second parameter is reserved and the
  *      <nFilterOption> is passed as a third parameter.
  *
  *      <nFilterOption> Indicates if filters and/or scopes are to be respected if set.
@@ -516,10 +516,18 @@
  *  $ONELINER$
  *      Get the logical key number of the current record in the given index
  *  $SYNTAX$
- *      ADSKeyNo([<xTag>], [<nFilterOption>]) --> nKeyNo
+ *      ADSKeyNo([<xTag>], <cIgnoredIndexFile>, [<nFilterOption>]) --> nKeyNo
  *  $ARGUMENTS$
  *      <xTag>          Numeric order number OR index tag name. Default is current index.
  *
+ *      <cIgnoredIndexFile>   This parameter is not processed. In other Harbour RDDs,
+ *      the second parameter to "ordKeyNo" takes a second argument to identify
+ *      a particular Index File in cases where two files are open that contain
+ *      orders with the same name. The ADS driver does not support this and
+ *      will select the first order with the requested name. To stay consistent
+ *      with other RDDs, therefore, the second parameter is reserved and the
+ *      <nFilterOption> is passed as a third parameter.
+ *
  *      <nFilterOption> Indicates if filters and/or scopes are to be respected if set.
  *
  *      <table>