diff --git a/App.config b/App.config
index b0d25882..cabd6c76 100644
--- a/App.config
+++ b/App.config
@@ -5,14 +5,7 @@
             <section name="GARbro.GUI.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
-  <system.diagnostics>
-    <trace autoflush="true">
-      <listeners>
-        <add type="System.Diagnostics.TextWriterTraceListener" name="TextWriter" initializeData="trace.log"/>
-      </listeners>
-    </trace>
-  </system.diagnostics>
-  <startup> 
+    <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
     </startup>
     <userSettings>
diff --git a/App.xaml.cs b/App.xaml.cs
index 0f20f349..db182dcf 100644
--- a/App.xaml.cs
+++ b/App.xaml.cs
@@ -50,6 +50,11 @@ namespace GARbro.GUI
 
         void ApplicationStartup (object sender, StartupEventArgs e)
         {
+#if DEBUG
+            string trace_dir = Path.GetDirectoryName (System.Reflection.Assembly.GetExecutingAssembly().Location);
+            Trace.Listeners.Add (new TextWriterTraceListener (Path.Combine (trace_dir, "trace.log")));
+            Trace.AutoFlush = true;
+#endif
             Trace.WriteLine ("ApplicationStartup --------------------------------", "GARbro.GUI.App");
             if (0 != e.Args.Length)
             {