diff --git a/altermime-0.3.10-cflags.patch b/altermime-0.3.10-cflags.patch
new file mode 100644
index 0000000..c18518f
--- /dev/null
+++ b/altermime-0.3.10-cflags.patch
@@ -0,0 +1,11 @@
+--- Makefile.orig	2008-11-16 08:45:45.000000000 +0000
++++ Makefile	2011-02-11 16:33:17.777602478 +0000
+@@ -9,7 +9,7 @@
+ #								opposite of a disclaimer.
+ #ALTERMIME_OPTIONS=-DALTERMIME_PRETEXT
+ ALTERMIME_OPTIONS=
+-CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
++#CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
+ OBJS= strstack.o mime_alter.o ffget.o pldstr.o filename-filters.o logger.o MIME_headers.o libmime-decoders.o boundary-stack.o qpe.o
+ 
+ 
diff --git a/altermime.spec b/altermime.spec
index a41eb9f..c439e5a 100644
--- a/altermime.spec
+++ b/altermime.spec
@@ -1,6 +1,6 @@
 Name:           altermime
 Version:        0.3.10
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Alter MIME-encoded mailpacks
 
 Group:          Applications/Internet
@@ -8,6 +8,7 @@ License:        BSD
 URL:            http://www.pldaniels.com/altermime/
 Source0:        http://www.pldaniels.com/altermime/altermime-%{version}.tar.gz
 Patch0:         altermime-0.3.10-fprintf-compiler-error.patch
+Patch1:         altermime-0.3.10-cflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -24,9 +25,11 @@ alterMIME can:
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
 make %{?_smp_mflags}
 
 
@@ -48,6 +51,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Feb 11 2011 Tim Jackson <rpm@timj.co.uk> 0.3.10-5
+- Ensure distribution-supplied CFLAGS are used during compile
+- Fix build on F15
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.3.10-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild