diff --git a/xterm.spec b/xterm.spec
index e08bbba..0b048a2 100644
--- a/xterm.spec
+++ b/xterm.spec
@@ -1,7 +1,7 @@
 Summary: xterm terminal emulator for the X Window System
 Name:    xterm
 Version: 211
-Release: 1.FC6
+Release: 4.FC6
 URL:     http://dickey.his.com/xterm
 License: MIT
 Group:   User Interface/X
@@ -22,7 +22,7 @@ Patch8: xterm-208-root-grab-console.patch
 Patch9: xterm-209-bz182382.patch
 Patch10: xterm-209-bz183993.patch
 Patch11: xterm-211-bz186094.patch
-
+Patch12: xterm-211-bz186935.patch
 BuildRequires: libXft-devel
 BuildRequires: freetype-devel
 BuildRequires: libXrender-devel
@@ -41,7 +41,8 @@ BuildRequires: zlib-devel
 BuildRequires: libtermcap-devel
 BuildRequires: utempter
 
-%{?!DEBUGINFO:  %define DEBUGINFO   1}
+%{?!DEBUGINFO:     %define DEBUGINFO    1}
+%{?!enable_trace:  %define enable_trace 0}
 %if !%{DEBUGINFO}
 %define debug_package %{nil}
 %endif
@@ -74,10 +75,15 @@ programs that can't use the window system directly.
 #%patch10 -p1 -b .bz183993
 #      ^- patch now upstream
 %patch11 -p1 -b .bz186094
+%patch12 -p1 -b .bz186935
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -DPROJECTROOT='\"/usr\"'"
+%if %{DEBUGINFO}
 export CFLAGS="$RPM_OPT_FLAGS"
+%else
+export CFLAGS=`echo $RPM_OPT_FLAGS | sed 's/-O2 -g/-g3 -gdwarf-2/g'`;
+%endif
 %configure --enable-luit \
            --enable-warnings \
            --enable-wide-chars \
@@ -90,6 +96,9 @@ export CFLAGS="$RPM_OPT_FLAGS"
 %if %{_with_256_color}
 	   --enable-256-color \
 %endif
+%if %{enable_trace}
+	   --enable-trace \
+%endif
 ;
 export XTERM_TTY_GROUP_NAME=tty;
 make
@@ -123,6 +132,9 @@ exit 0
 %doc xterm.log.html ctlseqs.ms ctlseqs.txt UnicodeData.txt 16colors.txt README.i18n
 
 %changelog
+* Wed Mar 29 2006 Jason Vas Dias <jvdias@redhat.com> - 211-4
+- fix bug 186935: cursor GCs must be freed with XtReleaseGC
+
 * Tue Mar 21 2006 Jason Vas Dias <jvdias@redhat.com> - 211-1
 - Upgrade to upstream version 211 (fixes bug 186094).
 - Enable new 'utf8Title' resource by default