--- a/pkg/soap/soap.go	Mon May 06 13:05:49 2019 +0200
+++ b/pkg/soap/soap.go	Mon May 06 13:19:59 2019 +0200
@@ -15,6 +15,7 @@
 
 import (
 	"bytes"
+	"context"
 	"crypto/tls"
 	"encoding/xml"
 	"fmt"
@@ -23,7 +24,10 @@
 	"math/rand"
 	"net"
 	"net/http"
+	"sync"
 	"time"
+
+	"gemma.intevation.de/gemma/pkg/config"
 )
 
 const timeout = time.Duration(30 * time.Second)
@@ -272,6 +276,21 @@
 
 	client := &http.Client{Transport: tr}
 
+	timeout := config.SOAPTimeout()
+
+	ctx, cancel := context.WithTimeout(context.Background(), timeout)
+
+	var once sync.Once
+
+	defer once.Do(cancel)
+
+	req = req.WithContext(ctx)
+
+	go func() {
+		defer once.Do(cancel)
+		<-ctx.Done()
+	}()
+
 	res, err := client.Do(req)
 	if err != nil {
 		return err