diff -urNp includes/file.inc includes/file.inc
--- includes/file.inc	2007-01-05 06:32:22.000000000 +0100
+++ includes/file.inc	2007-01-11 23:54:52.000000000 +0100
@@ -644,7 +644,7 @@ function file_scan_directory($dir, $mask
         if (is_dir("$dir/$file") && $recurse) {
           $files = array_merge($files, file_scan_directory("$dir/$file", $mask, $nomask, $callback, $recurse, $key, $min_depth, $depth + 1));
         }
-        elseif ($depth >= $min_depth && ereg($mask, $file)) {
+        elseif ($depth >= $min_depth && preg_match("/$mask/", $file)) {
           $filename = "$dir/$file";
           $basename = basename($file);
           $name = substr($basename, 0, strrpos($basename, '.'));
diff -urNp includes/install.inc includes/install.inc
--- includes/install.inc	2007-01-02 06:05:38.000000000 +0100
+++ includes/install.inc	2007-01-12 00:07:02.000000000 +0100
@@ -243,7 +243,7 @@ function drupal_rewrite_settings($settin
 function drupal_get_install_files($module_list = array()) {
   $installs = array();
   foreach ($module_list as $module) {
-    $installs = array_merge($installs, file_scan_directory('./modules', "^$module.install$", array('.', '..', 'CVS'), 0, TRUE, 'name', 0));
+    $installs = array_merge($installs, file_scan_directory('./modules', '^'. $module .'\.install$', array('.', '..', 'CVS'), 0, TRUE, 'name', 0));
   }
   return $installs;
 }
diff -urNp drupal/modules/system/system.module test/modules/system/system.module
--- drupal/modules/system/system.module	2007-01-11 04:32:56.000000000 +0100
+++ test/modules/system/system.module	2007-01-12 00:14:22.000000000 +0100
@@ -959,7 +959,7 @@ function system_theme_data() {
 
   // Find styles in each theme's directory.
   foreach ($themes as $theme) {
-    foreach (file_scan_directory(dirname($theme->filename), 'style.css$') as $style) {
+    foreach (file_scan_directory(dirname($theme->filename), 'style\.css$') as $style) {
       $style->style = TRUE;
       $style->template = isset($theme->template) ? $theme->template : FALSE;
       $style->name = basename(dirname($style->filename));
