diff --git a/gnu-efi-add-optflags-to-make-defaults.patch b/gnu-efi-add-optflags-to-make-defaults.patch
new file mode 100644
index 0000000..acf1291
--- /dev/null
+++ b/gnu-efi-add-optflags-to-make-defaults.patch
@@ -0,0 +1,14 @@
+Index: gnu-efi-3.0/Make.defaults
+===================================================================
+--- gnu-efi-3.0.orig/Make.defaults
++++ gnu-efi-3.0/Make.defaults
+@@ -48,7 +48,8 @@ ARCH	   := $(shell uname -m | sed s,i[34
+ OS	   = $(shell uname -s)
+ INCDIR	   = -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) -I$(TOPDIR)/inc/protocol 
+ CPPFLAGS   = -DCONFIG_$(ARCH)
+-CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
++OPTFLAGS   = -O2 -g
++CFLAGS	   = $(ARCH3264) $(OPTFLAGS) -fpic -fshort-wchar -fno-strict-aliasing -fno-merge-constants
+ ASFLAGS    = $(ARCH3264)
+ LDFLAGS	   = -nostdlib
+ INSTALL	   = install
diff --git a/rpmlintrc b/gnu-efi-rpmlintrc
similarity index 75%
rename from rpmlintrc
rename to gnu-efi-rpmlintrc
index a7a06cc..0c60a8c 100644
--- a/rpmlintrc
+++ b/gnu-efi-rpmlintrc
@@ -1,3 +1,4 @@
 addFilter(".*devel-file-in-non-devel-package.*")
 addFilter(".*static-library-without-debuginfo.*")
+addFilter(".*source-or-patch-not-compressed.*")
 addFilter(".*source-or-patch-not-bzipped.*")
diff --git a/gnu-efi.changes b/gnu-efi.changes
index 2cf0823..4eb915a 100644
--- a/gnu-efi.changes
+++ b/gnu-efi.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul 18 15:47:22 UTC 2012 - meissner@suse.com
+
+- cleaned below up, pass in OPTFLAGS and LIBDIR to make.
+
+-------------------------------------------------------------------
+Wed Jul 18 03:06:46 UTC 2012 - malcolmlewis@opensuse.org
+
+- Add gnu-efi-add-optflags-to-make-defaults.patch: Add additional
+  RPM OPT FLAGS to Make.defaults to avoid brp check warning.
+- Spec file clean up and rename rpmlintrc file.
+
 -------------------------------------------------------------------
 Thu Jun 14 03:17:09 UTC 2012 - glin@suse.com
 
diff --git a/gnu-efi.spec b/gnu-efi.spec
index 73fb148..95353e5 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -17,22 +17,23 @@
 
 
 Name:           gnu-efi
-ExclusiveArch:  ia64 %ix86 x86_64
+Version:        3.0q
+Release:        0
 Summary:        Library for EFI Applications
 License:        BSD-3-Clause ; GPL-2.0+
 Group:          Development/Libraries/Other
-Version:        3.0q
-Release:        0
 Url:            http://sourceforge.net/projects/gnu-efi
 Source:         http://downloads.sourceforge.net/gnu-efi/gnu-efi_3.0q.orig.tar.gz
-Source1:        rpmlintrc
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source1:        %{name}-rpmlintrc
+# PATCH-FIX-OPENSUSE gnu-efi-add-optflags-to-make-defaults.patch malcolmlewis@opensuse.org -- Add additional RPM OPT FLAGS to Make.defaults to avoid brp check warning.
+Patch0:         gnu-efi-add-optflags-to-make-defaults.patch
 BuildRequires:  kernel-source
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+ExclusiveArch:  ia64 %ix86 x86_64
 
 %description
-Library for EFI applications.
-
-
+Library to develop EFI applications for IA-64 (IPF), IA-32 (x86) and x86_64
+platforms using the GNU toolchain and the EFI development environment.
 
 Authors:
 --------
@@ -42,23 +43,18 @@ Authors:
 
 %prep
 %setup -q -n gnu-efi-3.0
+%patch0 -p1
 
 %build
-#CFLAGS="-fpic -fshort-wchar -fno-strict-aliasing -funsigned-char -fno-stack-protector"
-make LINUX_HEADERS=/usr/src/linux
+make LINUX_HEADERS=/usr/src/linux OPTFLAGS="$RPM_OPT_FLAGS"
 
 %install
-make install INSTALLROOT=$RPM_BUILD_ROOT%{_prefix}
-[ "%{_lib}" == "lib" ] ||
-  mv $RPM_BUILD_ROOT/usr/lib $RPM_BUILD_ROOT/usr/%{_lib}
+make install INSTALLROOT=%{buildroot}%{_prefix} LIBDIR=%_lib
 %if 0
-mkdir $RPM_BUILD_ROOT%{_prefix}/%{_lib}/%{name}
-cp -p apps/*.efi $RPM_BUILD_ROOT%{_prefix}/%{_lib}/%{name}
+mkdir %{buildroot}%{_prefix}/%{_lib}/%{name}
+cp -p apps/*.efi %{buildroot}%{_prefix}/%{_lib}/%{name}
 %endif
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
 %doc README.*