diff --git a/http/longpoll/longpoll.go b/http/longpoll/longpoll.go
new file mode 100644
index 000000000..782b9721c
--- /dev/null
+++ b/http/longpoll/longpoll.go
@@ -0,0 +1,92 @@
+package longpoll
+
+import (
+	"context"
+	"time"
+)
+
+// LongPollFunc should return true if long polling did
+// resolve, false otherwise. If error is returned, the
+// long polling will be canceled. The passed context
+// will be guarded by the time budget (deadline) of the
+// longpolling request.
+type LongPollFunc func(context.Context) (bool, error)
+
+// Config for long polling
+type Config struct {
+	// RetryTime time to wait between two retries
+	RetryTime time.Duration
+	// MinWaitTime min time to wait
+	MinWaitTime time.Duration
+	// MaxWaitTime max time to wait
+	MaxWaitTime time.Duration
+}
+
+// Default configuration for http long polling
+// wait half a second between retries, min 1 sec and max 60 sec
+var Default = Config{
+	RetryTime:   time.Millisecond * 500,
+	MinWaitTime: time.Second,
+	MaxWaitTime: time.Second * 60,
+}
+
+// Until executes the given function fn until duration d is passed or context is canceled.
+// The constaints of the Default configuration apply.
+func Until(ctx context.Context, d time.Duration, fn LongPollFunc) (ok bool, err error) {
+	return Default.LongPollUntil(ctx, d, fn)
+}
+
+// LongPollUntil executes the given function fn until duration d is passed or context is canceled.
+// If duration is below or above the MinWaitTime, MaxWaitTime from the Config, the values will
+// be set to the allowed min/max respectively. Other checking is up to the caller. The resulting time
+// budget is communicated via the provided context. This is a defence measure to not have accidental
+// long running routines. If no duration is given (0) the long poll will have exactly one execution.
+func (c Config) LongPollUntil(ctx context.Context, d time.Duration, fn LongPollFunc) (ok bool, err error) {
+	until := time.Now()
+
+	if d != 0 {
+		if d < c.MinWaitTime { // guard lower bound
+			until = until.Add(c.MinWaitTime)
+		} else if d > c.MaxWaitTime { // guard upper bound
+			until = until.Add(c.MaxWaitTime)
+		} else {
+			until = until.Add(d)
+		}
+	}
+
+	fnCtx, cancel := context.WithDeadline(ctx, until)
+	defer cancel()
+
+loop:
+	for {
+		ok, err = fn(fnCtx)
+		if err != nil {
+			return
+		}
+
+		// fn returns true, break the loop
+		if ok {
+			break
+		}
+
+		// no long polling
+		if d <= 0 {
+			break
+		}
+
+		// long pooling desired?
+		if !time.Now().Add(c.RetryTime).Before(until) {
+			break
+		}
+
+		select {
+		// handle context cancelation
+		case <-ctx.Done():
+			return false, ctx.Err()
+		case <-time.After(c.RetryTime):
+			continue loop
+		}
+	}
+
+	return
+}
diff --git a/http/longpoll/longpoll_test.go b/http/longpoll/longpoll_test.go
new file mode 100644
index 000000000..266438c24
--- /dev/null
+++ b/http/longpoll/longpoll_test.go
@@ -0,0 +1,93 @@
+package longpoll
+
+import (
+	"context"
+	"errors"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestLongPollUntilBounds(t *testing.T) {
+	called := 0
+	ok, err := Until(context.Background(), -1, func(ctx context.Context) (bool, error) {
+		budget, ok := ctx.Deadline()
+		assert.True(t, ok)
+		assert.Equal(t, time.Millisecond*999, budget.Sub(time.Now()).Truncate(time.Millisecond))
+		called++
+		return true, nil
+	})
+	assert.True(t, ok)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, called)
+
+	called = 0
+	ok, err = Until(context.Background(), time.Hour, func(ctx context.Context) (bool, error) {
+		budget, ok := ctx.Deadline()
+		assert.True(t, ok)
+		assert.Equal(t, time.Second*59, budget.Sub(time.Now()).Truncate(time.Second))
+		called++
+		return true, nil
+	})
+	assert.True(t, ok)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, called)
+}
+
+func TestLongPollUntilNoTimeout(t *testing.T) {
+	called := 0
+	ok, err := Until(context.Background(), 0, func(context.Context) (bool, error) {
+		called++
+		return false, nil
+	})
+	assert.False(t, ok)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, called)
+
+	called = 0
+	ok, err = Until(context.Background(), 0, func(context.Context) (bool, error) {
+		called++
+		return true, nil
+	})
+	assert.True(t, ok)
+	assert.NoError(t, err)
+	assert.Equal(t, 1, called)
+}
+
+func TestLongPollUntilErr(t *testing.T) {
+	called := 0
+	ok, err := Until(context.Background(), 0, func(context.Context) (bool, error) {
+		called++
+		return false, errors.New("Foo")
+	})
+	assert.False(t, ok)
+	assert.Error(t, err)
+	assert.Equal(t, 1, called)
+}
+
+func TestLongPollUntilTimeout(t *testing.T) {
+	called := 0
+	ok, err := Until(context.Background(), time.Second, func(context.Context) (bool, error) {
+		called++
+		return false, nil
+	})
+	assert.False(t, ok)
+	assert.NoError(t, err)
+	assert.Equal(t, 2, called)
+}
+
+func TestLongPollUntilTimeoutWithContext(t *testing.T) {
+	called := 0
+	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
+	defer cancel()
+	ok, err := Until(ctx, time.Second*2, func(context.Context) (bool, error) {
+		called++
+		return false, nil
+	})
+	assert.False(t, ok)
+	assert.Error(t, err)
+	assert.Equal(t, context.DeadlineExceeded, err)
+	assert.GreaterOrEqual(t, called, 2)
+	assert.LessOrEqual(t, called, 3)
+}