diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http.go
index 4bb6346313f50b23c7e753702392c200091ee50c..157e113a3564580d2a237325b5a7779143888aba 100644
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http.go
+++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http.go
@@ -8,14 +8,12 @@ import (
 	"io/ioutil"
 	"net/http"
 	"net/url"
-	"time"
 
 	log "github.com/Sirupsen/logrus"
 )
 
 // For timestamp parsing
 const IsoFormat = "2006-01-02T15:04:05-0700"
-const LastModifiedHeaderFormat = time.RFC1123
 
 /**
  * Decodes JSON and writes a Bad Request status if it fails.
diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http_test.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http_test.go
deleted file mode 100644
index 94792456755b34fd5d06a4cc669c0581c9c8ffa1..0000000000000000000000000000000000000000
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/http_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package flamenco
-
-import (
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	check "gopkg.in/check.v1"
-)
-
-type HttpTestSuite struct{}
-
-var _ = check.Suite(&HttpTestSuite{})
-
-func (s *HttpTestSuite) TestParseDates(c *check.C) {
-	parsed_iso, err1 := time.Parse(IsoFormat, "2017-01-23T13:04:05+0200")
-	parsed_http, err2 := time.Parse(LastModifiedHeaderFormat, "Mon, 23 Jan 2017 13:04:05 CEST")
-	assert.Nil(c, err1)
-	assert.Nil(c, err2)
-	assert.Equal(c, parsed_iso, parsed_http)
-}
diff --git a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go
index b50dfcdd9183fa41d1c4b4697757220ca89713ed..793e0583cf64f29c894a0538d86898f7af3bf350 100644
--- a/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go
+++ b/packages/flamenco-manager-go/src/flamenco-manager/flamenco/upstream.go
@@ -159,7 +159,7 @@ func download_tasks_from_upstream(config *Conf, mongo_sess *mgo.Session) {
 	if settings.DepsgraphLastModified != nil {
 		log.Infof("Getting tasks from upstream Flamenco %s If-Modified-Since %s", get_url,
 			*settings.DepsgraphLastModified)
-		req.Header.Set("If-Modified-Since", *settings.DepsgraphLastModified)
+		req.Header.Set("X-Flamenco-If-Updated-Since", *settings.DepsgraphLastModified)
 	} else {
 		log.Infof("Getting tasks from upstream Flamenco %s", get_url)
 	}
@@ -174,7 +174,7 @@ func download_tasks_from_upstream(config *Conf, mongo_sess *mgo.Session) {
 		log.Debug("Server-side depsgraph was not modified, nothing to do.")
 		return
 	}
-	if resp.StatusCode == 204 {
+	if resp.StatusCode == http.StatusNoContent {
 		log.Info("No tasks for us; sleeping.")
 		return
 	}
@@ -223,7 +223,7 @@ func download_tasks_from_upstream(config *Conf, mongo_sess *mgo.Session) {
 	}
 
 	// Check if we had a Last-Modified header, since we need to remember that.
-	last_modified := resp.Header.Get("Last-Modified")
+	last_modified := resp.Header.Get("X-Flamenco-Last-Updated")
 	if last_modified != "" {
 		log.Info("Last modified task was at ", last_modified)
 		settings.DepsgraphLastModified = &last_modified