diff --git a/ChangeLog b/ChangeLog
index 905147d4d..a75fc4fcf 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-09-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html, libraries/footer.inc.php, 
+      libraries/dbg/profiling.php: remove profiling feature
+      due to licensing issues (non GPL code)
+
 2006-09-15 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/finnish: Update, thanks to Yoneh - yoneh.
     * lang/bulgarian: Update, thanks to Stanislav Yordanov - stanprog.
diff --git a/Documentation.html b/Documentation.html
index 1ee62cfd0..77ea0514b 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1862,7 +1862,8 @@ ALTER TABLE `pma_column_comments`
         to the end of every page displayed in the main window with profiling
         statistics for that page.<br />
         You may need to increase the maximum execution time for this to
-        complete successfully.</dd>
+	complete successfully. <i>Profiling was removed from the code
+	for version 2.9.0 due to licensing issues.</i></dd>
 
     <dt id="cfg_DBG_profile_threshold">$cfg['DBG']['profile']['threshold'] float (units in milliseconds)</dt>
     <dd><b>DEVELOPERS ONLY!</b><br />
diff --git a/libraries/dbg/profiling.php b/libraries/dbg/profiling.php
deleted file mode 100644
index 77d8b8139..000000000
--- a/libraries/dbg/profiling.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-/**
- * holds function for dumping profiling data
- * 
- * allways use $GLOBALS here, as this script is included by footer.inc.hp
- * which can also be included from inside a function
- */
-
-if ( ! empty( $GLOBALS['DBG'] ) 
-  && $GLOBALS['cfg']['DBG']['profile']['enable'] ) {
-
-    /**
-     * Displays profiling results when called
-     * WARNING: this function is SLOW
-     */
-    function dbg_dump_profiling_results() {
-        /* Applies to the original 'dbg_dump_profiling_results' function,
-         * sourced from http://dd.cron.ru/dbg/download.php?h=prof_sample2
-         * Copyright (c) 2002. Dmitri Dmitrienko
-         * LICENCE: This source file is subject to Mozilla Public License (MPL)
-         * AUTHOR: Dmitri Dmitrienko <dd@cron.ru>
-         */
-        dbg_get_profiler_results( $dbg_prof_results = '' );
-        $cwdlen =  strlen(getcwd()); // gma added var, $cwdlen =  strlen(getcwd());
-        echo '<br /><table xml:lang="en" dir="ltr" width="1000" cellspacing="0" cellpadding="2" style="font:8pt courier">' . "\n" .
-            '<thead>' . "\n";
-        // gma added "$tr ="
-        $tr = '<tr>' . "\n" .
-            '<th>' . $GLOBALS['strDBGModule'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGLine'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGHits'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGTimePerHitMs'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGTotalTimeMs'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGMinTimeMs'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGMaxTimeMs'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGContextID'] . '</th>' . "\n" .
-            '<th>' . $GLOBALS['strDBGContext'] . '</th>' . "\n" .
-            '</tr>' . "\n";  // gma change "." to ";"
-        echo $tr.'</thead><tbody style="vertical-align: top">' . "\n";
-        $lines      = 0; // gma added "echo $tr." and "$lines = 0;"
-        $ctx_name   = '';
-        $mod_name   = '';
-        $ctx_id     = '';
-        $odd_row    = true;
-        foreach ( $dbg_prof_results['line_no'] as $idx => $line_no ) {
-            dbg_get_module_name( $dbg_prof_results['mod_no'][$idx], $mod_name );
-
-            //if (strpos("!".$mod_name, 'dbg.php') > 0) continue;
-
-            $time_sum = $dbg_prof_results['tm_sum'][$idx] * 1000;
-            $time_avg_hit = $time_sum / $dbg_prof_results['hit_count'][$idx];
-
-            $time_sum = sprintf( '%.3f', $time_sum );
-            $time_avg_hit = sprintf('%.3f', $time_avg_hit);
-            $time_min = sprintf( '%.3f', $dbg_prof_results['tm_min'][$idx] * 1000 );
-            $time_max = sprintf( '%.3f', $dbg_prof_results['tm_max'][$idx] * 1000 );
-            dbg_get_source_context( $dbg_prof_results['mod_no'][$idx],
-                $line_no, $ctx_id );
-
-            // use a default context name if needed
-            if ( dbg_get_context_name( $ctx_id, $ctx_name )
-                    && strlen($ctx_name) == 0 ) {
-                $ctx_name = "::main";
-            }
-
-            if ( $time_avg_hit > $GLOBALS['cfg']['DBG']['profile']['threshold'] ) {
-                echo '<tr class="' . $odd_row ? 'odd' : 'even' . '">' .
-                    // gma changed "$mod_name" to "substr($mod_name, $cwdlen+1)"
-                    '<td>' . substr($mod_name, $cwdlen+1) . '</td>' .
-                    '<td>' . $line_no . '</td>' .
-                    '<td>' . $dbg_prof_results['hit_count'][$idx] . '</td>' .
-                    '<td>' . $time_avg_hit . '</td>' .
-                    '<td>' . $time_sum . '</td>' .
-                    '<td>' . $time_min . '</td>' .
-                    '<td>' . $time_max . '</td>' .
-                    '<td>' . $ctx_id . '</td>' .
-                    '<td>' . $ctx_name . '</td>' .
-                    '</tr>' . "\n";
-                
-                // gma added line. Repeats the header every x lines.
-                if ( $lines === 19 ) {
-                    $odd_row    = true;
-                    $lines      = 0;
-                    echo $tr;
-                } else {
-                    $odd_row    = ! $odd_row;
-                    $lines++;
-                }
-            }
-        }
-        echo '</tbody></table>';
-    }
-}
-/*  gma ... Developer Notes
-These two scriptlets can be used as On/Off buttons in your browsers, add to links. 
-ON:
-javascript: document.cookie = 'DBGSESSID=' + escape('1;d=1,p=1') + '; path=/'; document.execCommand('refresh'); 
-or ... 
-javascript: document.cookie = 'DBGSESSID=' + escape('1;d=0,p=1') + '; path=/'; document.execCommand('refresh');
-OFF:
-javascript: document.cookie = 'DBGSESSID=' + escape('1;d=0,p=0') + '; path=/'; document.execCommand('refresh');
-*/
-?>
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 285da4c56..44bff3692 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -136,17 +136,20 @@ if (file_exists('./config.footer.inc.php')) {
 /**
  * Generates profiling data if requested
  */
+
+// profiling deactivated due to licensing issues
 if (! empty($GLOBALS['cfg']['DBG']['enable'])
   && ! empty($GLOBALS['cfg']['DBG']['profile']['enable'])) {
     //run the basic setup code first
     require_once './libraries/dbg/setup.php';
     //if the setup ran fine, then do the profiling
+    /*
     if (! empty($GLOBALS['DBG'])) {
         require_once './libraries/dbg/profiling.php';
         dbg_dump_profiling_results();
     }
+    */
 }
-
 ?>
 </body>
 </html>