diff --git a/pommed-1.15-optflags.patch b/pommed-1.15-optflags.patch
new file mode 100644
index 0000000..e5deef3
--- /dev/null
+++ b/pommed-1.15-optflags.patch
@@ -0,0 +1,39 @@
+Index: gpomme/Makefile
+===================================================================
+--- gpomme/Makefile.orig	2007-12-01 12:51:32.000000000 +0100
++++ gpomme/Makefile	2008-02-24 21:49:43.000000000 +0100
+@@ -14,7 +14,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon
+ 
+ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
++CFLAGS += -g -Wall $(DBUS_CFLAGS) $(GTK_CFLAGS) $(CONFUSE_CFLAGS) $(GLADE_CFLAGS) $(INOTIFY_CFLAGS)
+ LDFLAGS = -lpthread $(DBUS_LIBS) $(GTK_LIBS) $(CONFUSE_LIBS) $(GLADE_LIBS)
+ 
+ SOURCES = gpomme.c theme.c conffile.c \
+Index: pommed/Makefile
+===================================================================
+--- pommed/Makefile.orig	2007-12-19 22:35:58.000000000 +0100
++++ pommed/Makefile	2008-02-24 21:49:22.000000000 +0100
+@@ -16,7 +16,7 @@ CONFUSE_LIBS = $(shell pkg-config libcon
+ 
+ INOTIFY_CFLAGS = $(shell test -e /usr/include/sys/inotify.h || echo -DNO_SYS_INOTIFY_H)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
++CFLAGS += -g -Wall $(DBUS_CFLAGS) $(ALSA_CFLAGS) $(AUDIOFILE_CFLAGS) $(CONFUSE_CFLAGS) $(INOTIFY_CFLAGS)
+ 
+ LDFLAGS = -pthread $(DBUS_LIBS) $(ALSA_LIBS) $(AUDIOFILE_LIBS) $(CONFUSE_LIBS)
+ 
+Index: wmpomme/Makefile
+===================================================================
+--- wmpomme/Makefile.orig	2007-11-27 17:38:21.000000000 +0100
++++ wmpomme/Makefile	2008-02-24 21:48:32.000000000 +0100
+@@ -3,7 +3,7 @@ CC = gcc
+ DBUS_CFLAGS = $(shell pkg-config dbus-1 --cflags) -DDBUS_API_SUBJECT_TO_CHANGE
+ DBUS_LIBS = $(shell pkg-config dbus-1 --libs)
+ 
+-CFLAGS = -g -O2 -Wall $(DBUS_CFLAGS)
++CFLAGS += -g -Wall $(DBUS_CFLAGS)
+ LDFLAGS = -lXpm -lXext -lX11 $(DBUS_LIBS)
+ 
+ SOURCES = wmgeneral.c wmpomme.c \
diff --git a/pommed.changes b/pommed.changes
index 131be12..4b10331 100644
--- a/pommed.changes
+++ b/pommed.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Feb 24 21:57:42 CET 2008 - crrodriguez@suse.de
+
+- use RPM_OPT_FLAGS 
+
 -------------------------------------------------------------------
 Tue Feb 12 01:08:53 CET 2008 - ro@suse.de
 
diff --git a/pommed.spec b/pommed.spec
index 1912b18..acf8e65 100644
--- a/pommed.spec
+++ b/pommed.spec
@@ -16,7 +16,7 @@ Summary:        Apple laptops hotkeys event handler
 License:        GPL v2 only
 Group:          Hardware/Mobile
 Version:        1.15
-Release:        1
+Release:        6
 Url:            http://technologeek.org/projects/pommed/
 BuildRequires:  alsa-devel audiofile-devel gtk2-devel libglade2-devel pciutils-devel update-desktop-files
 BuildRequires:  dbus-1-devel libconfuse-devel libsmbios-devel libsmbios-libs
@@ -35,6 +35,7 @@ Source4:        pommed-README.SuSE
 Source5:        pommed-rpmlintrc
 Patch:          pommed-1.10-build.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch1:         pommed-1.15-optflags.patch
 %define         kdedir /opt/kde3
 
 %description
@@ -95,11 +96,12 @@ Authors:
     Julien BLACHE <jb@jblache.org>
 
 %prep
-%setup
+%setup -q
 %patch
+%patch1
 
 %build
-## FIXME: make CFLAGS="$RPM_OPT_FLAGS" %{?jobs:-j%jobs}
+export CFLAGS="$RPM_OPT_FLAGS"
 make %{?jobs:-j%jobs}
 
 %install
@@ -189,6 +191,8 @@ rm -rf %buildroot
 %_mandir/man1/wmpo*
 
 %changelog
+* Sun Feb 24 2008 crrodriguez@suse.de
+- use RPM_OPT_FLAGS
 * Tue Feb 12 2008 ro@suse.de
 - update to 1.15:
   - pommed: add preliminary support for the MacBook Air1,1;