diff --git a/cronjob/chart/Makefile b/cronjob/chart/Makefile
index c6c52a4..19601d2 100644
--- a/cronjob/chart/Makefile
+++ b/cronjob/chart/Makefile
@@ -1,8 +1,8 @@
 CC      = gcc
 LD      = gcc
 RM	= rm
-CFLAGS  = -c
-LDFLAS  = -o
+CFLAGS  = $(PackageFlags) -c
+LDFLAS  = $(PackageFlags) -o
 LD_LIBS = -lm -lpq -lgd -lpng -lz -lfreetype
 #INCL	= -I$$(pg_config --includedir)
 
diff --git a/cronjob/checksensor/Makefile b/cronjob/checksensor/Makefile
index 6c5f148..7017d60 100644
--- a/cronjob/checksensor/Makefile
+++ b/cronjob/checksensor/Makefile
@@ -1,8 +1,8 @@
 CC      = gcc
 LD      = gcc
 RM	= rm
-CFLAGS  = -c
-LDFLAS  = -o
+CFLAGS  = $(PackageFlags) -c
+LDFLAS  = $(PackageFlags) -o
 INCL	= -I$$(pg_config --includedir)
 
 BIN_NAME = weather_checksensor
diff --git a/deamon/seriell/Makefile b/deamon/seriell/Makefile
index 99b3e32..6b4c1ee 100644
--- a/deamon/seriell/Makefile
+++ b/deamon/seriell/Makefile
@@ -1,8 +1,8 @@
 CC      = gcc
 LD      = gcc
 RM	= rm
-CFLAGS  = -c
-LDFLAS  = -o
+CFLAGS  = $(PackageFlags) -c
+LDFLAS  = $(PackageFlags) -o
 INCL	= -I$$(pg_config --includedir)
 
 BIN_NAME = weatherdeamon
diff --git a/debian/rules b/debian/rules
index ee8a006..62d3336 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,13 +18,7 @@ export DH_OPTIONS
 
 
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+PackageFlags= -Wall -O3
 
 configure: configure-stamp
 configure-stamp:
@@ -41,7 +35,7 @@ build-arch: build-arch-stamp
 build-arch-stamp: configure-stamp 
 
 	# Add here commands to compile the arch part of the package.
-	$(MAKE) 
+	$(MAKE) PackageFlags="$(PackageFlags)"
 	touch $@
 
 build-indep: build-indep-stamp
@@ -83,7 +77,6 @@ install-arch:
 	# Add here commands to install the arch part of the package into 
 	# debian/tmp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/weatherstation
-
 	dh_install -s --sourcedir debian/weatherstation/
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep