diff --git a/ChangeLog b/ChangeLog
index 777c518dc..f5a18b12f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2001-10-22  Robin Johnson  <robbat2@users.sourceforge.net>
+	* config.inc.php3: remove ENCODE, DECODE, ENCRYPT functions.
+
 2001-10-21  Loïc Chapeaux  <lolo@phpheaven.net>
 	* user_details.php3, libraries/user_details.js: restored the "show grants"
 	  table at the top of the "other grants" page.
diff --git a/config.inc.php3 b/config.inc.php3
index 773389bb6..52f94682f 100755
--- a/config.inc.php3
+++ b/config.inc.php3
@@ -208,13 +208,10 @@ $cfgFunctions = array(
    'ASCII',
    'CHAR',
    'SOUNDEX',
-   'ENCRYPT',
    'LCASE',
    'UCASE',
    'NOW',
    'PASSWORD',
-   'ENCODE',
-   'DECODE',
    'MD5',
    'RAND',
    'LAST_INSERT_ID',