---
 benchmark/Makefile |    4 +++-
 user/Makefile      |    3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- drbd-8.2.5.orig/benchmark/Makefile	2007-12-09 13:54:21.000000000 +0100
+++ drbd-8.2.5/benchmark/Makefile	2008-04-15 14:28:50.253569000 +0200
@@ -1,6 +1,8 @@
-CFLAGS=-Wall
+CFLAGS=-Wall $(OPTFLAGS)
+
+OPTFLAGS=-O2
 
 all: dm io-latency-test
 
 io-latency-test: io-latency-test.c
 	$(CC) -pthread -o $@ $^
--- drbd-8.2.5.orig/user/Makefile	2007-10-09 16:13:11.000000000 +0200
+++ drbd-8.2.5/user/Makefile	2008-04-15 14:28:29.595246000 +0200
@@ -18,11 +18,12 @@
 #
 
 KDIR := /lib/modules/$(shell uname -r)/build
 
 CC = gcc
-CFLAGS = -g -O2 -c -W -Wall -I../drbd
+OPTFLAGS = -O2
+CFLAGS = -g $(OPTFLAGS) -c -W -Wall -I../drbd
 # for the netlink connector stuff <linux/connector.h>:
 drbdsetup: CFLAGS += -I$(KDIR)/include
 drbdsetup drbdmeta: CFLAGS += -fno-strict-aliasing
 
 drbdadm-obj = drbdadm_scanner.o drbdadm_parser.o drbdadm_main.o \