diff --git a/ChangeLog b/ChangeLog
index 429467d02..a0efb24e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/mm.c (grub_memalign): Disable auto-unloadding of
+	unused modules since currently referrence counter isn't reliable and
+	there isn't much memory to recover there anyway.
+
 2011-05-14  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/dl.c (grub_dl_load_file): Decrease ref counter
diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
index 8d9b5db78..d54f3f240 100644
--- a/grub-core/kern/mm.c
+++ b/grub-core/kern/mm.c
@@ -311,11 +311,13 @@ grub_memalign (grub_size_t align, grub_size_t size)
       count++;
       goto again;
 
+#if 0
     case 1:
       /* Unload unneeded modules.  */
       grub_dl_unload_unneeded ();
       count++;
       goto again;
+#endif
 
     default:
       break;