diff --git a/tpm-tools.changes b/tpm-tools.changes
index 4eefc0f..2f2f9ba 100644
--- a/tpm-tools.changes
+++ b/tpm-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri May 27 11:17:43 UTC 2011 - idonmez@novell.com
+
+- Disable gcc's new unused-but-set-variable warnings, these are just
+  noise as BIO_*(...) functions returns a value and needs to 
+  be handled 
+
 -------------------------------------------------------------------
 Mon Sep 27 07:54:30 CEST 2010 - meissner@suse.de
 
diff --git a/tpm-tools.spec b/tpm-tools.spec
index 7c2f13d..91298c8 100644
--- a/tpm-tools.spec
+++ b/tpm-tools.spec
@@ -29,7 +29,6 @@ Release:        4
 Summary:        Trusted Platform Module (TPM) administration tools
 Source0:        %name-%version.tar.bz2
 Source1:        %name-rpmlintrc
-#Patch0:       %name-%version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %install_info_prereq
 
@@ -51,7 +50,11 @@ Authors:
 %setup -q
 
 %build
-export RPMOPTFLAGS="$RPM_OPT_FLAGS -Wall -pipe -fno-strict-aliasing"
+# Disable unused-but-set warnings with gcc >= 4.6
+%if 0%{?suse_version} >= 1200
+export CFLAGS="%{optflags} -Wno-unused-but-set-variable"
+%endif
+
 %configure --disable-static
 make