diff -Naur xrdp-0.4.0/libxrdp/Makefile xrdp-0.4.0.oden/libxrdp/Makefile
--- xrdp-0.4.0/libxrdp/Makefile	2007-04-08 23:19:42.000000000 +0200
+++ xrdp-0.4.0.oden/libxrdp/Makefile	2008-05-15 17:22:55.000000000 +0200
@@ -13,7 +13,7 @@
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
           -DXRDP_KEY_FILE=\"$(CFGDIR)/rsakeys.ini\"
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
diff -Naur xrdp-0.4.0/rdp/Makefile xrdp-0.4.0.oden/rdp/Makefile
--- xrdp-0.4.0/rdp/Makefile	2006-08-07 08:03:17.000000000 +0200
+++ xrdp-0.4.0.oden/rdp/Makefile	2008-05-15 17:23:20.000000000 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared
diff -Naur xrdp-0.4.0/sesman/libscp/Makefile xrdp-0.4.0.oden/sesman/libscp/Makefile
--- xrdp-0.4.0/sesman/libscp/Makefile	2007-05-28 01:20:48.000000000 +0200
+++ xrdp-0.4.0.oden/sesman/libscp/Makefile	2008-05-15 17:24:43.000000000 +0200
@@ -18,7 +18,7 @@
 	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
-CFLAGS = -Wall -O2 -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I/usr/include/nptl -fPIC $(DEFINES)
 LDFLAGS = -shared -L/usr/gnu/lib -L/usr/lib/nptl -lpthread
 C_OS_FLAGS = $(CFLAGS) -c
 CC = gcc
diff -Naur xrdp-0.4.0/sesman/Makefile xrdp-0.4.0.oden/sesman/Makefile
--- xrdp-0.4.0/sesman/Makefile	2008-05-15 17:25:45.000000000 +0200
+++ xrdp-0.4.0.oden/sesman/Makefile	2008-05-15 17:23:47.000000000 +0200
@@ -18,7 +18,7 @@
 	  -DSESMAN_PID_FILE=\"$(PIDDIR)/sesman.pid\" \
 	  -DSESMAN_SESSVC_FILE=\"sessvc\"
 
-CFLAGS = -Wall -O2 -I../common -I/usr/include/nptl -I./libscp $(DEFINES) 
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -I/usr/include/nptl -I./libscp $(DEFINES) 
 LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L./libscp
 C_OS_FLAGS = $(CFLAGS) -c
 LDADD = -ldl -lpthread -lscp
diff -Naur xrdp-0.4.0/sesman/tools/Makefile xrdp-0.4.0.oden/sesman/tools/Makefile
--- xrdp-0.4.0/sesman/tools/Makefile	2008-05-15 17:25:45.000000000 +0200
+++ xrdp-0.4.0.oden/sesman/tools/Makefile	2008-05-15 17:24:14.000000000 +0200
@@ -13,7 +13,7 @@
 
 DEFINES = -DLIBSCP_CLIENT
 
-CFLAGS = -Wall -O2 -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../../common -I../ -I/usr/include/nptl -I../libscp $(DEFINES)
 LDFLAGS = -L/usr/gnu/lib -L/usr/lib/nptl -L../libscp -Wl,-rpath,. -lpthread -ldl -lscp
 C_OS_FLAGS = $(CFLAGS) -c
 LDADD = -ldl -lpthread -lscp
diff -Naur xrdp-0.4.0/vnc/Makefile xrdp-0.4.0.oden/vnc/Makefile
--- xrdp-0.4.0/vnc/Makefile	2007-05-12 06:19:43.000000000 +0200
+++ xrdp-0.4.0.oden/vnc/Makefile	2008-05-15 17:25:00.000000000 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
 C_OS_FLAGS = $(CFLAGS) -c -g
 LDFLAGS = -shared
 LIBS = -ldl
diff -Naur xrdp-0.4.0/xrdp/Makefile xrdp-0.4.0.oden/xrdp/Makefile
--- xrdp-0.4.0/xrdp/Makefile	2007-04-13 05:50:59.000000000 +0200
+++ xrdp-0.4.0.oden/xrdp/Makefile	2008-05-15 17:25:16.000000000 +0200
@@ -15,7 +15,7 @@
 DEFINES = -DXRDP_CFG_FILE=\"$(CFGDIR)/xrdp.ini\" \
           -DXRDP_PID_FILE=\"$(PIDDIR)/xrdp.pid\"
 
-CFLAGS = -Wall -O2 -I../common -I../libxrdp $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -I../libxrdp $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -L/usr/gnu/lib -L../libxrdp -Wl,-rpath,.
diff -Naur xrdp-0.4.0/xup/Makefile xrdp-0.4.0.oden/xup/Makefile
--- xrdp-0.4.0/xup/Makefile	2007-05-12 06:20:14.000000000 +0200
+++ xrdp-0.4.0.oden/xup/Makefile	2008-05-15 17:25:32.000000000 +0200
@@ -10,7 +10,7 @@
 
 DEFINES =
 
-CFLAGS = -Wall -O2 -I../common -fPIC $(DEFINES)
+CFLAGS = $(RPM_OPT_FLAGS) -I../common -fPIC $(DEFINES)
 #CFLAGS += -DXRDP_DEBUG
 C_OS_FLAGS = $(CFLAGS) -c
 LDFLAGS = -shared