diff --git a/config/interpolation.go b/config/interpolation.go
index fc420de9a..5127690eb 100644
--- a/config/interpolation.go
+++ b/config/interpolation.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 func isNum(c uint8) bool {
diff --git a/config/merge_v1.go b/config/merge_v1.go
index 0aebb05bc..e167bc87c 100644
--- a/config/merge_v1.go
+++ b/config/merge_v1.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 	"github.com/hyperhq/libcompose/utils"
 )
diff --git a/config/merge_v2.go b/config/merge_v2.go
index fd565c805..135e0ef22 100644
--- a/config/merge_v2.go
+++ b/config/merge_v2.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 	"github.com/hyperhq/libcompose/utils"
 )
diff --git a/config/schema_helpers.go b/config/schema_helpers.go
index 43de4fdb4..b7d3fb62c 100644
--- a/config/schema_helpers.go
+++ b/config/schema_helpers.go
@@ -19,7 +19,7 @@ type (
 	portsFormatChecker       struct{}
 )
 
-func (checker environmentFormatChecker) IsFormat(input string) bool {
+func (checker environmentFormatChecker) IsFormat(input interface{}) bool {
 	// If the value is a boolean, a warning should be given
 	// However, we can't determine type since gojsonschema converts the value to a string
 	// Adding a function with an interface{} parameter to gojsonschema is probably the best way to handle this
diff --git a/config/validation.go b/config/validation.go
index 970da0816..fa31cf126 100644
--- a/config/validation.go
+++ b/config/validation.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/xeipuuv/gojsonschema"
 )
 
diff --git a/docker/container.go b/docker/container.go
index feec6a525..aae668201 100644
--- a/docker/container.go
+++ b/docker/container.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/container"
diff --git a/docker/image.go b/docker/image.go
index 7c09db397..50085a310 100644
--- a/docker/image.go
+++ b/docker/image.go
@@ -9,7 +9,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/engine-api/types"
 	"github.com/hyperhq/hypercli/pkg/jsonmessage"
diff --git a/docker/project.go b/docker/project.go
index 233dd67ff..68565020a 100644
--- a/docker/project.go
+++ b/docker/project.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/hyperhq/libcompose/config"
 	"github.com/hyperhq/libcompose/lookup"
 	"github.com/hyperhq/libcompose/project"
diff --git a/docker/service.go b/docker/service.go
index d5eab4dda..3920a5ad0 100644
--- a/docker/service.go
+++ b/docker/service.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/docker/engine-api/client"
 	"github.com/docker/go-connections/nat"
 	"github.com/hyperhq/libcompose/config"
diff --git a/lookup/file.go b/lookup/file.go
index 70b3d8d60..aafd63de1 100644
--- a/lookup/file.go
+++ b/lookup/file.go
@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 )
 
 // relativePath returns the proper relative path for the given file path. If
diff --git a/project/context.go b/project/context.go
index 0740c1475..7e0650fdb 100644
--- a/project/context.go
+++ b/project/context.go
@@ -9,7 +9,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/hyperhq/libcompose/config"
 	"github.com/hyperhq/libcompose/logger"
 )
diff --git a/project/listener.go b/project/listener.go
index f21dfad7e..583d41371 100644
--- a/project/listener.go
+++ b/project/listener.go
@@ -3,7 +3,7 @@ package project
 import (
 	"bytes"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"github.com/hyperhq/libcompose/project/events"
 )
 
diff --git a/project/project.go b/project/project.go
index 7f371f56f..2087727f3 100644
--- a/project/project.go
+++ b/project/project.go
@@ -7,7 +7,7 @@ import (
 
 	"golang.org/x/net/context"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/docker/engine-api/types"
 	"github.com/docker/engine-api/types/filters"
 	"github.com/hyperhq/libcompose/config"
diff --git a/project/service-wrapper.go b/project/service-wrapper.go
index d5f6d9d4c..b5c26a978 100644
--- a/project/service-wrapper.go
+++ b/project/service-wrapper.go
@@ -3,7 +3,7 @@ package project
 import (
 	"sync"
 
-	log "github.com/Sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 	"github.com/hyperhq/libcompose/project/events"
 )
 
diff --git a/utils/util.go b/utils/util.go
index 868eb92a8..7b9a064c5 100644
--- a/utils/util.go
+++ b/utils/util.go
@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	yaml "github.com/cloudfoundry-incubator/candiedyaml"
 )