diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 597b010e8..14d63600a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2008-04-08  Corinna Vinschen  <corinna@vinschen.de>
+
+	* postinstall: Disable adding registry mounts to /etc/fstab for now.
+
 2008-04-07  Christopher Faylor  <me+cygwin@cgf.cx>
 
 	Remove unneeded header files from source files throughout.
diff --git a/winsup/cygwin/postinstall b/winsup/cygwin/postinstall
index 69ec04936..68ae132a6 100755
--- a/winsup/cygwin/postinstall
+++ b/winsup/cygwin/postinstall
@@ -124,48 +124,51 @@ then
 
 EOF
 
-  usr_bin=""
-  usr_lib=""
-  key='\HKLM\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2'
-  for subkey in $(regtool -q list "$key")
-  do
-    if [[ "$subkey" =~ /.* ]]
-    then
-      [ "$subkey" = "/usr/bin" ] && usr_bin="1"
-      [ "$subkey" = "/usr/lib" ] && usr_lib="1"
-      nat=$(regtool -q get "$key\\$subkey\native")
-      nat="${nat//\\//}"
-      nat="${nat// /\\040}"
-      psx="${subkey// /\\040}"
-      flags=$(regtool -q get "$key\\$subkey\flags")
-      echo -n "${nat} ${psx} some_fs "
-      print_flags $flags
-      echo " 0 0"
-    fi >> /etc/fstab
-  done
-  [ -z "$usr_bin" ] &&
+  #
+  # TODO: Enable the below code for the first official release.
+  #
+  #usr_bin=""
+  #usr_lib=""
+  #key='\HKLM\SOFTWARE\Cygnus Solutions\Cygwin\mounts v2'
+  #for subkey in $(regtool -q list "$key")
+  #do
+  #  if [[ "$subkey" =~ /.* ]]
+  #  then
+  #    [ "$subkey" = "/usr/bin" ] && usr_bin="1"
+  #    [ "$subkey" = "/usr/lib" ] && usr_lib="1"
+  #    nat=$(regtool -q get "$key\\$subkey\native")
+  #    nat="${nat//\\//}"
+  #    nat="${nat// /\\040}"
+  #    psx="${subkey// /\\040}"
+  #    flags=$(regtool -q get "$key\\$subkey\flags")
+  #    echo -n "${nat} ${psx} some_fs "
+  #    print_flags $flags
+  #    echo " 0 0"
+  #  fi >> /etc/fstab
+  #done
+  #[ -z "$usr_bin" ] &&
     echo "${CYGROOT//\\//}/bin /usr/bin ${FS_TYPE} binary 0 0" >> /etc/fstab
-  [ -z "$usr_lib" ] &&
+  #[ -z "$usr_lib" ] &&
     echo "${CYGROOT//\\//}/lib /usr/lib ${FS_TYPE} binary 0 0" >> /etc/fstab
 
-  cygd=""
-  prefix=$(regtool -q get "$key\cygdrive prefix")
-  # Don't take system and cygdrive flags into account when testing
-  if [ -n "$prefix" \
-       -a \( "$prefix" != "/cygdrive" \ -o "$(( $flags & ~0x28 ))" -ne 2 \) ]
-  then
-    cygd="1"
-    psx="${prefix// /\\040}"
-    echo -n "none ${psx} cygdrive "
-    print_flags $flags
-    echo ",user 0 0"
-  fi >> /etc/fstab
+  #cygd=""
+  #prefix=$(regtool -q get "$key\cygdrive prefix")
+  ## Don't take system and cygdrive flags into account when testing
+  #if [ -n "$prefix" \
+  #     -a \( "$prefix" != "/cygdrive" \ -o "$(( $flags & ~0x28 ))" -ne 2 \) ]
+  #then
+  #  cygd="1"
+  #  psx="${prefix// /\\040}"
+  #  echo -n "none ${psx} cygdrive "
+  #  print_flags $flags
+  #  echo ",user 0 0"
+  #fi >> /etc/fstab
 
-  if [ -z "$cygd" ]
-  then
+  #if [ -z "$cygd" ]
+  #then
     echo "# This is default anyway:" >> /etc/fstab
     echo "# none /cygdrive cygdrive binary,user 0 0" >> /etc/fstab
-  fi
+  #fi
   IFS="$_OLD_IFS"
 fi