diff -p -up beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs.spew beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs
--- beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs.spew	2007-12-14 09:46:08.000000000 +0100
+++ beagle-0.3.2/beagled/IndexHelper/IndexHelper.cs	2007-12-28 17:08:14.000000000 +0100
@@ -90,16 +90,13 @@ namespace Beagle.IndexHelper {
 			else
 				disable_textcache = false;
 			
-			// FIXME: We always turn on full debugging output!  We are still
-			// debugging this code, after all...
-			//bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
+			bool debug = (Environment.GetEnvironmentVariable ("BEAGLE_DEBUG_FLAG_IS_SET") != null);
 
 			last_activity = DateTime.Now;
 
 			Log.Initialize (PathFinder.LogDir,
 					"IndexHelper",
-					//debug ? LogLevel.Debug : LogLevel.Warn,
-					LogLevel.Debug,
+					debug ? LogLevel.Debug : LogLevel.Warn,
 					run_by_hand || log_in_fg);
 
 			Log.Always ("Starting Index Helper process (version {0})", ExternalStringsHack.Version);
diff -p -up beagle-0.3.2/beagled/BeagleDaemon.cs.spew beagle-0.3.2/beagled/BeagleDaemon.cs
--- beagle-0.3.2/beagled/BeagleDaemon.cs.spew	2007-12-14 09:46:08.000000000 +0100
+++ beagle-0.3.2/beagled/BeagleDaemon.cs	2007-12-28 17:11:12.000000000 +0100
@@ -451,11 +451,7 @@ namespace Beagle.Daemon {
 
 			MainLoopThread = Thread.CurrentThread;
 
-			// FIXME: We always turn on full debugging output!  We are still
-			// debugging this code, after all...
-			// arg_debug ? LogLevel.Debug : LogLevel.Warn
-			
-			Log.Initialize (PathFinder.LogDir, "Beagle", LogLevel.Debug, arg_fg);
+			Log.Initialize (PathFinder.LogDir, "Beagle", arg_debug ? LogLevel.Debug : LogLevel.Warn, arg_fg);
 			Log.Always ("Starting Beagle Daemon (version {0})", ExternalStringsHack.Version);
 			Log.Always ("Running on {0}", SystemInformation.MonoRuntimeVersion);
 			Log.Always ("Command Line: {0}",