diff -up linuxtv-dvb-apps-1.1.1/test/Makefile.orig linuxtv-dvb-apps-1.1.1/test/Makefile
--- linuxtv-dvb-apps-1.1.1/test/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/test/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,7 +1,7 @@
 # Makefile for Linux DVB API Version 3 test programs
 
 CC = gcc
-CFLAGS = -g -O2 -W -Wall -I../include
+CFLAGS = $(RPM_OPT_FLAGS) -W -Wall -I../include
 
 TARGETS = \
 	diseqc		\
diff -up linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile.orig linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile
--- linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/av7110_loadkeys/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -g -Wall -O2
+CFLAGS = $(RPM_OPT_FLAGS) -Wall
 
 all: av7110_loadkeys evtest
 
diff -up linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbdate/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 CC      = gcc
-CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
+CFLAGS  = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
 LFLAGS  =
 
 OBJS    = dvbdate.o
diff -up linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbnet/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 CC      = gcc
-CFLAGS  = -g -O2 -MD -Wall -I. -I../../include
+CFLAGS  = $(RPM_OPT_FLAGS) -MD -Wall -I. -I../../include
 LFLAGS  =
 
 OBJS    = dvbnet.o
diff -up linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile.orig linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile
--- linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile.orig	2004-01-19 19:10:16.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/dvbtraffic/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 dvbtraffic: dvbtraffic.c
-	gcc -MD -g -O2 -Wall -I../../include $< -o $@
+	$(CC) -MD -Wall $(RPM_OPT_FLAGS) -I../../include $< -o $@
 
 clean:
 	rm -f *.o *.d dvbtraffic
diff -up linuxtv-dvb-apps-1.1.1/util/lib/Makefile.orig linuxtv-dvb-apps-1.1.1/util/lib/Makefile
--- linuxtv-dvb-apps-1.1.1/util/lib/Makefile.orig	2004-01-17 18:59:46.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/lib/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include -I.
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I.
 LFLAGS = -g -Wall
 
 OBJS = lnb.o
diff -up linuxtv-dvb-apps-1.1.1/util/scan/Makefile.orig linuxtv-dvb-apps-1.1.1/util/scan/Makefile
--- linuxtv-dvb-apps-1.1.1/util/scan/Makefile.orig	2006-05-18 02:34:53.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1/util/scan/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 
 CC = gcc
-CFLAGS = -MD -g -Wall -O2 -I../../include
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include
 LFLAGS = -g -Wall
 
 OBJS = diseqc.o dump-zap.o dump-vdr.o scan.o lnb.o section.o atsc_psip_section.o
diff -up linuxtv-dvb-apps-1.1.1/util/szap/Makefile.orig linuxtv-dvb-apps-1.1.1/util/szap/Makefile
--- linuxtv-dvb-apps-1.1.1/util/szap/Makefile.orig	2006-05-18 02:31:54.000000000 +0300
+++ linuxtv-dvb-apps-1.1.1/util/szap/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 CC = gcc
-CFLAGS = -MD -Wall -g -O2 -I../../include -I../lib
-LFLAGS = -Wall -g -O2
+CFLAGS = -MD -Wall $(RPM_OPT_FLAGS) -I../../include -I../lib
+LFLAGS = -Wall $(RPM_OPT_FLAGS)
 RM = rm -f
 
 TARGETS = szap tzap czap azap femon
diff -up linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile.orig linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile
--- linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile.orig	2004-01-22 00:13:45.000000000 +0200
+++ linuxtv-dvb-apps-1.1.1/util/ttusb_dec_reset/Makefile	2008-08-30 09:17:05.000000000 +0300
@@ -1,6 +1,6 @@
 CC	= gcc
 RM	= rm -f
-CFLAGS	= -g -Wall -O2
+CFLAGS	= -Wall $(RPM_OPT_FLAGS)
 LFLAGS	= -g -Wall
 LDFLAGS = -lusb