diff -aur wordpress-2.7.1/wp-admin/options-misc.php wordpress-2.7.1-hspaans/wp-admin/options-misc.php
--- wordpress-2.7.1/wp-admin/options-misc.php	2008-12-09 19:03:31.000000000 +0100
+++ wordpress-2.7.1-hspaans/wp-admin/options-misc.php	2009-03-28 17:39:31.000000000 +0100
@@ -39,6 +39,7 @@
 </td>
 </tr>
 
+<?php if ( !defined('WP_UPLOADS_USE_YEARMONTH_FOLDERS') ) { ?>
 <tr>
 <th scope="row" colspan="2" class="th-full">
 <label for="uploads_use_yearmonth_folders">
@@ -47,7 +48,10 @@
 </label>
 </th>
 </tr>
-<?php do_settings_fields('misc', 'default'); ?>
+<?php
+	}
+	do_settings_fields('misc', 'default');
+?>
 </table>
 
 <table class="form-table">
diff -aur wordpress-2.7.1/wp-includes/functions.php wordpress-2.7.1-hspaans/wp-includes/functions.php
--- wordpress-2.7.1/wp-includes/functions.php	2009-02-04 00:06:17.000000000 +0100
+++ wordpress-2.7.1-hspaans/wp-includes/functions.php	2009-03-28 19:15:35.000000000 +0100
@@ -1857,7 +1857,8 @@
 	$burl = $url;
 
 	$subdir = '';
-	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
+	if ( ( get_option( 'uploads_use_yearmonth_folders') && !defined('WP_UPLOADS_USE_YEARMONTH_FOLDERS')) ||
+	     ( constant('WP_UPLOADS_USE_YEARMONTH_FOLDERS') ) ) {
 		// Generate the yearly and monthly dirs
 		if ( !$time )
 			$time = current_time( 'mysql' );