diff --git a/interface/ri_oper.py b/interface/ri_oper.py
index e9e18c3..70e499f 100644
--- a/interface/ri_oper.py
+++ b/interface/ri_oper.py
@@ -160,7 +160,7 @@ class Mount(Operation):
         n = 0
         for dir in set([ m.directory for m in ri_data.MountPoint.dict.values() if m.directory ]):
             for k in ri_data.MountPoint.dict.keys():
-                if ri_data.MountPoint.dict[k] == dir and ri_data.MountPoint.dict[k].filesystem:
+                if ri_data.MountPoint.dict[k].directory == dir and ri_data.MountPoint.dict[k].filesystem:
                     # during configure fstab, use dict of Mount
                     Mount.dict[k]=dir
                     mount+='/dev/%s %s %s\n' %(k,dir,ri_data.MountPoint.dict[k].filesystem)
@@ -192,8 +192,9 @@ class ConfigureFstab(Mount):
 
     def get_stdin(self):
         fstab=''
+        # Note: Mount.dict are mount point. it isn't equal ri_data.MountPoint.dict
         for k in Mount.dict.keys():
-            if ri_data.MountPoint.dict[k] != 'swap':
+            if ri_data.MountPoint.dict[k].filesystem != 'swap':
                 fstab += "/dev/%s %s %s\n" %(k,Mount.dict[k],ri_data.MountPoint.dict[k].filesystem)
 
         for k in ri_data.MountPoint.dict.keys(): 
diff --git a/xml/dependency.xml b/xml/dependency.xml
index 8d23972..f994893 100644
--- a/xml/dependency.xml
+++ b/xml/dependency.xml
@@ -172,6 +172,11 @@
       <depending package='bison'/>
     </buildtime>
   </package>
+  <package name='bash_initrd'>
+    <buildtime>
+      <depending package='bash'/>
+    </buildtime>
+  </package>
   <package name='bc'>
     <runtime>
       <depending via='shared_lib' package='ncurses'/>
@@ -210,6 +215,10 @@
     <runtime>
     </runtime>
   </package>
+  <package name='busybox'>
+    <runtime>
+    </runtime>
+  </package>
   <package name='byacc'>
     <runtime>
     </runtime>
@@ -330,10 +339,23 @@
       <depending via='shared_lib' package='openssl'/>
     </runtime>
   </package>
+  <package name='dhcp_rh'>
+    <runtime>
+      <depending via='shared_lib' package='glibc'/>
+    </runtime>
+    <buildtime>
+      <depending package='groff'/>
+    </buildtime>
+  </package>
   <package name='dhcpcd'>
     <runtime>
     </runtime>
   </package>
+  <package name='dhcpv6'>
+    <runtime>
+      <depending via='shared_lib' package='glibc'/>
+    </runtime>
+  </package>
   <package name='dialog'>
     <runtime>
       <depending via='shared_lib' package='ncurses'/>
@@ -569,6 +591,11 @@
     </buildtime>
   </package>
   <package name='glibc'/>
+  <package name='glibc_initrd'>
+    <buildtime>
+      <depending package='glibc'/>
+    </buildtime>
+  </package>
   <package name='glitz'>
     <runtime>
       <depending via='shared_lib' package='Mesa'/>
@@ -668,7 +695,6 @@
   </package>
   <package name='haskell-ghc'>
     <runtime>
-      <depending via='shared_lib' package='glibc'/>
       <depending via='shared_lib' package='gmp'/>
       <depending via='shared_lib' package='haskell-libedit'/>
       <depending via='shared_lib' package='ncurses'/>
@@ -679,67 +705,12 @@
       <depending package='openssl'/>
     </buildtime>
   </package>
-  <package name='haskell-cabal-install'>
-    <runtime>
-      <depending via='shared_lib' package='gmp'/>
-      <depending via='shared_lib' package='glibc'/>
-      <depending via='shared_lib' package='zlib'/>
-    </runtime>
-    <buildtime>
-      <depending package='haskell-ghc'/>
-      <depending package='zlib'/>
-    </buildtime>
-  </package>
-  <package name='haskell-bytestring'>
-    <buildtime>
-      <depending package='haskell-cabal-install'/>
-    </buildtime>
-  </package>
-  <package name='haskell-binary'>
-    <buildtime>
-      <depending package='haskell-cabal-install'/>
-      <depending package='haskell-bytestring'/>
-    </buildtime>
-  </package>
-  <package name='haskell-digest'>
-    <buildtime>
-      <depending package='haskell-cabal-install'/>
-      <depending package='haskell-bytestring'/>
-    </buildtime>
-  </package>
-  <package name='haskell-utf8-string'>
-    <buildtime>
-      <depending package='haskell-cabal-install'/>
-      <depending package='haskell-bytestring'/>
-    </buildtime>
-  </package>
-  <package name='haskell-zlib-all'>
-    <buildtime>
-      <depending package='haskell-bytestring'/>
-    </buildtime>
-  </package>
-  <package name='haskell-zip-archive'>
-    <buildtime>
-      <depending package='haskell-cabal-install'/>
-      <depending package='haskell-bytestring'/>
-      <depending package='haskell-binary'/>
-      <depending package='haskell-digest'/>
-      <depending package='haskell-utf8-string'/>
-      <depending package='zlib'/>
-    </buildtime>
-  </package>
   <package name='haskell-pandoc'>
     <runtime>
-      <depending via='shared_lib' package='glibc'/>
       <depending via='shared_lib' package='gmp'/>
-      <depending via='shared_lib' package='zlib'/>
     </runtime>
     <buildtime>
       <depending package='haskell-ghc'/>
-      <depending package='haskell-cabal-install'/>
-      <depending package='haskell-bytestring'/>
-      <depending package='haskell-utf8-string'/>
-      <depending package='haskell-zip-archive'/>
       <depending package='ruby'/>
     </buildtime>
   </package>
@@ -1708,6 +1679,16 @@
       <depending via='shared_lib' package='attr'/>
     </runtime>
   </package>
+  <package name='libdhcp'>
+    <runtime>
+      <depending via='shared_lib' package='glibc'/>
+    </runtime>
+    <buildtime>
+      <depending package='libnl'/>
+      <depending package='dhcp_rh'/>
+      <depending package='dhcpv6'/>
+    </buildtime>
+  </package>
   <package name='libidl'>
     <runtime>
       <depending via='shared_lib' package='glib2'/>
@@ -1735,6 +1716,11 @@
       <depending package='libjpeg'/>
     </buildtime>
   </package>
+  <package name='libnl'>
+    <runtime>
+      <depending via='shared_lib' package='glibc'/>
+    </runtime>
+  </package>
   <package name='libogg'>
     <runtime>
     </runtime>
@@ -1824,6 +1810,11 @@
       <depending via='shared_lib' package='readline'/>
     </runtime>
   </package>
+  <package name='lvm2_initrd'>
+    <buildtime>
+      <depending package='lvm2'/>
+    </buildtime>
+  </package>
   <package name='lynx'>
     <runtime>
       <depending via='shared_lib' package='ncurses'/>
@@ -1859,12 +1850,33 @@
     <runtime>
     </runtime>
   </package>
+  <package name='mdadm_initrd'>
+    <buildtime>
+      <depending package='mdadm'/>
+    </buildtime>
+  </package>
   <package name='mectools'>
     <runtime>
       <depending via='shell_script' package='libcap'/>
       <depending via='shared_lib' package='libmec'/>
     </runtime>
   </package>
+  <package name='mkinitrd'>
+    <runtime>
+      <depending via='shared_lib' package='device-mapper'/>
+      <depending via='shared_lib' package='e2fsprogs'/>
+      <depending via='shared_lib' package='glib2'/>
+      <depending via='shared_lib' package='glibc'/>
+      <depending via='shared_lib' package='parted'/>
+    </runtime>
+    <buildtime>
+      <depending package='libdhcp'/>
+      <depending package='parted'/>
+      <depending package='dhcpv6'/>
+      <depending package='dhcp_rh'/>
+      <depending package='popt'/>
+    </buildtime>
+  </package>
   <package name='mktemp'>
     <runtime>
     </runtime>
@@ -1924,6 +1936,11 @@
     <runtime>
     </runtime>
   </package>
+  <package name='ncurses_initrd'>
+    <buildtime>
+      <depending package='ncurses'/>
+    </buildtime>
+  </package>
   <package name='net-snmp'>
     <runtime>
       <depending via='shared_lib' package='lm_sensors'/>
@@ -2305,6 +2322,11 @@
     <runtime>
     </runtime>
   </package>
+  <package name='readline_initrd'>
+    <buildtime>
+      <depending package='readline'/>
+    </buildtime>
+  </package>
   <package name='reiserfsprogs'>
     <runtime>
       <depending via='shared_lib' package='e2fsprogs'/>
@@ -2332,11 +2354,20 @@
   <package name='ruby'>
     <runtime>
       <depending via='shared_lib' package='db'/>
+      <depending via='shared_lib' package='expat'/>
+      <depending via='shared_lib' package='fontconfig'/>
+      <depending via='shared_lib' package='freetype'/>
       <depending via='shared_lib' package='gdbm'/>
-      <depending via='shared_lib' package='glibc'/>
+      <depending via='shared_lib' package='libxcb'/>
       <depending via='shared_lib' package='ncurses'/>
       <depending via='shared_lib' package='openssl'/>
       <depending via='shared_lib' package='readline'/>
+      <depending via='shared_lib' package='tcl'/>
+      <depending via='shared_lib' package='tk'/>
+      <depending via='shared_lib' package='xorg-x11-libX11'/>
+      <depending via='shared_lib' package='xorg-x11-libXau'/>
+      <depending via='shared_lib' package='xorg-x11-libXft'/>
+      <depending via='shared_lib' package='xorg-x11-libXrender'/>
       <depending via='shared_lib' package='zlib'/>
     </runtime>
     <buildtime>
@@ -2598,6 +2629,11 @@
     <runtime>
     </runtime>
   </package>
+  <package name='udev_initrd'>
+    <buildtime>
+      <depending package='udev'/>
+    </buildtime>
+  </package>
   <package name='unzip'>
     <runtime>
     </runtime>
@@ -3480,5 +3516,9 @@
       <depending package='lvm2'/>
       <depending package='readline'/>
     </buildtime>
+    <runtime>
+      <depending via='shared_lib' package='e2fsprogs'/>
+      <depending via='shared_lib' package='lvm2'/>
+    </runtime>
   </package>
 </dependency>
diff --git a/xml/install.xml b/xml/install.xml
index 2519667..e55fe99 100644
--- a/xml/install.xml
+++ b/xml/install.xml
@@ -264,7 +264,7 @@
         <package name='cpio'/>
         <package name='cracklib'/>
         <package name='db'/>
-        <package name='vixie-cron'/>
+        <package name='dcron'/>
         <package name='diffutils'/>
         <package name='e2fsprogs'/>
         <package name='eject'/>