diff --git a/audacity-1.3.8-gsocket-conflict.patch b/audacity-1.3.8-gsocket-conflict.patch
index 9fe33bd..1b296cf 100644
--- a/audacity-1.3.8-gsocket-conflict.patch
+++ b/audacity-1.3.8-gsocket-conflict.patch
@@ -1,22 +1,14 @@
 diff -Nur audacity-src-1.3.8-orig/src/AudacityApp.cpp audacity-src-1.3.8/src/AudacityApp.cpp
 --- audacity-src-1.3.8-orig/src/AudacityApp.cpp	2009-07-16 05:27:35.000000000 +0200
-+++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 22:18:14.000000000 +0200
-@@ -21,6 +21,9 @@
- #include <vld.h>
- #endif
- 
-+#include <gtk/gtk.h>
-+#undef GSocket
-+
- #include "Audacity.h" // This should always be included first
- 
- #include <wx/defs.h>
-@@ -331,7 +334,7 @@
++++ audacity-src-1.3.8/src/AudacityApp.cpp	2009-07-20 23:45:41.000000000 +0200
+@@ -331,7 +331,9 @@
  ///////////////////////////////////////////////////////////////////////////////
  
  #include <dlfcn.h>
 -#include <gtk/gtk.h>
-+/* #include <gtk/gtk.h> */
++/*#include <gtk/gtk.h>*/
++#include <glib/gtypes.h>
++#include <glib-object.h>
  
  typedef struct _GnomeProgram GnomeProgram;
  typedef struct _GnomeModuleInfo GnomeModuleInfo;
diff --git a/audacity.spec b/audacity.spec
index ea6690b..069040b 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -151,7 +151,7 @@ update-desktop-database &> /dev/null || :
 * Mon Jul 20 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.8-0.2.beta
 - glib2 2.21.1's gio in Rawhide F-12 introduces a GSocket that
   conflicts with wxGTK's GSocket class (gsocket.h): as a work-around,
-  include gtk/gtk.h first and undefine GSocket
+  include less glib headers
 
 * Mon Jul 20 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.8-0.1.beta
 - upgrade to 1.3.8-beta