diff --git a/Dockerfile b/Dockerfile
index c68bfff..bb81ff2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,7 @@
 FROM golang:latest 
 MAINTAINER Andreas Neue <an@dnix.de>
 
-RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim tzdata ca-certificates && apt-get clean
-RUN ln -fs /usr/share/zoneinfo/Europe/Berlin /etc/localtime && dpkg-reconfigure -f noninteractive tzdata
+RUN apt -y update && apt -y upgrade && apt-get install -y fortune vim ca-certificates && apt-get clean
 
 WORKDIR /go/src/flokati 
 COPY . .
diff --git a/modules/fuzzytime.go b/modules/fuzzytime.go
index 50d59f8..02802f7 100644
--- a/modules/fuzzytime.go
+++ b/modules/fuzzytime.go
@@ -29,8 +29,8 @@ func fuzzytimeHandleMessage(m *Message) {
 func fuzzytimeShow(channel string) {
 	t := time.Now()
 	h := t.Hour()
-	z, o := t.Zone()
-	h = h + o
+	tzcorrect := 1
+	h = h + tzcorrect // XXX: This should not be hardcoded
 	m := t.Minute()
 	s := "Es ist "
 	switch {