diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index c31e5ba6f2..8824689d33 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,13 @@
    The license applies to all entries newer than 2009-04-28.
 */
 
+2012-08-30 13:02 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+  * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+    ! Done: pairing of #ifdef|#if - #endif.
+
+    With this commit pair highlighting is complete until someone 
+    points to which escaped my knowledge.
+
 2012-08-30 15:30 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/include/hbinit.h
     * added HB_INIT_SYMBOLS_COUNT macro
@@ -25,7 +32,7 @@
   * contrib/hbqt/qtgui/hbqt_hbqplaintextedit.h
     + Added: METHOD|FUNCTION|PROCEDURE-RETURN pairs.
     + Added: #if-#endif pair.
-      TODO: #ifdef-#endif pair.
+      DONE: #ifdef-#endif pair.
 
 2012-08-29 14:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
   * contrib/hbide/console.prg
diff --git a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
index 8b8ccd5ad8..32c0c6c54b 100644
--- a/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
+++ b/harbour/contrib/hbqt/qtgui/hbqt_hbqplaintextedit.cpp
@@ -2799,8 +2799,10 @@ void HBQPlainTextEdit::hbBraceHighlight()
                else
                {
                   QRegExp openBrace( "(#IFDEF|#IF)" );
+                  openBrace.setCaseSensitivity( Qt::CaseInsensitive );
                   QRegExp closeBrace( "#ENDIF" );
-                  matchPair( cursor, QRegExp(), openBrace, closeBrace, true, QTextDocument::FindWholeWords, false );
+                  closeBrace.setCaseSensitivity( Qt::CaseInsensitive );
+                  matchPair( cursor, QRegExp(), openBrace, closeBrace, true, 0, false );
                   return;
                }
             }
@@ -2882,8 +2884,10 @@ void HBQPlainTextEdit::hbBraceHighlight()
          }
          else if( ( brace == "RETURN" ) )
          {
-            QRegExp openBrace( "(FUNCTION|METHOD|PROCEDURE)" );
-            QRegExp closeBrace( "\bRETURN\b" );
+            QRegExp openBrace( "\\b(FUNCTION|METHOD|PROCEDURE)\\b" );
+            openBrace.setCaseSensitivity( Qt::CaseInsensitive );
+            QRegExp closeBrace( "\\bRETURN\\b" );
+            closeBrace.setCaseSensitivity( Qt::CaseInsensitive );
             matchPair( cursor, QRegExp(), openBrace, closeBrace, true, QTextDocument::FindWholeWords, false );
             return;
          }