diff --git a/ChangeLog b/ChangeLog
index dea58bcdd..4e4629595 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2006-01-06 Marc Delisle  <lem9@users.sourceforge.net>
+    * db_datadict.php: bug #1389165, data dict shows all columns as Null Yes
+
 2006-01-04 Marc Delisle  <lem9@users.sourceforge.net>
     * server_privileges.php: since we use DROP USER, some options to
       remove a user did not work under MySQL 4.1.x (only mode 2 worked),
diff --git a/db_datadict.php b/db_datadict.php
index 37c54b8e4..2aeefbd4a 100644
--- a/db_datadict.php
+++ b/db_datadict.php
@@ -236,7 +236,7 @@ while ($row = PMA_DBI_fetch_assoc($rowset)) {
     </td>
     <td<?php echo $type_nowrap; ?> xml:lang="en" dir="ltr"><?php echo $type; ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $strAttribute; ?></td>*/ ?>
-    <td><?php echo (($row['Null'] == '') ? $strNo : $strYes); ?></td>
+    <td><?php echo (($row['Null'] == '' || $row['Null'] == 'NO') ? $strNo : $strYes); ?></td>
     <td nowrap="nowrap"><?php if (isset($row['Default'])) echo $row['Default']; ?></td>
 <?php /*    <td<?php echo $type_nowrap; ?>><?php echo $row['Extra']; ?></td>*/ ?>
         <?php