diff --git a/cmd/dex/config.go b/cmd/dex/config.go
index 2c0cae29ccec3aa92d9e9ff69fb40d382a618020..59733bc43dea3e3800b8450d1727d741e3d3b277 100644
--- a/cmd/dex/config.go
+++ b/cmd/dex/config.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/Sirupsen/logrus"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/bcrypt"
 
 	"github.com/coreos/dex/server"
diff --git a/cmd/dex/serve.go b/cmd/dex/serve.go
index 7819416149e593b002d566d485b6bb8110d8c8f0..f2221c719445d1282d6875e4ffcf44fb4e78c02d 100644
--- a/cmd/dex/serve.go
+++ b/cmd/dex/serve.go
@@ -13,8 +13,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/ghodss/yaml"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
diff --git a/connector/github/github.go b/connector/github/github.go
index c483246b25875ecbb13b85a8524869c21cdc5590..0a45c3c7dfe9f84c08f9dd9a44fe2433cf50fde2 100644
--- a/connector/github/github.go
+++ b/connector/github/github.go
@@ -19,8 +19,8 @@ import (
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/github"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/connector"
+	"github.com/sirupsen/logrus"
 )
 
 const (
diff --git a/connector/gitlab/gitlab.go b/connector/gitlab/gitlab.go
index b0f10cf1c3470b47b5e4d57c6c19e910d5c41f6a..df9b13b6cdb7a9ea51467fbff74ec5abaa946ff4 100644
--- a/connector/gitlab/gitlab.go
+++ b/connector/gitlab/gitlab.go
@@ -11,8 +11,8 @@ import (
 	"regexp"
 	"strconv"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/connector"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/oauth2"
 )
 
diff --git a/connector/ldap/ldap.go b/connector/ldap/ldap.go
index 127d5d9f809dec4656b010187baf4d92f865da53..9107031a0c3c3ef4f226459f737e0ae84238893c 100644
--- a/connector/ldap/ldap.go
+++ b/connector/ldap/ldap.go
@@ -12,8 +12,8 @@ import (
 
 	"gopkg.in/ldap.v2"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/connector"
+	"github.com/sirupsen/logrus"
 )
 
 // Config holds the configuration parameters for the LDAP connector. The LDAP
diff --git a/connector/ldap/ldap_test.go b/connector/ldap/ldap_test.go
index cd4d69ee2e2191658c018312dc5b06ba0ce0df61..08f85be33126d4eba7ee15ca7fd686e492cbad01 100644
--- a/connector/ldap/ldap_test.go
+++ b/connector/ldap/ldap_test.go
@@ -13,8 +13,8 @@ import (
 	"text/template"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/kylelemons/godebug/pretty"
+	"github.com/sirupsen/logrus"
 
 	"github.com/coreos/dex/connector"
 )
diff --git a/connector/mock/connectortest.go b/connector/mock/connectortest.go
index ef7749f7c05f3b3dcfb64c470a9be8cf01d827cd..7236230a0eadcb6d53c4b09e0249b86ad5195b35 100644
--- a/connector/mock/connectortest.go
+++ b/connector/mock/connectortest.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"net/url"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/connector"
+	"github.com/sirupsen/logrus"
 )
 
 // NewCallbackConnector returns a mock connector which requires no user interaction. It always returns
diff --git a/connector/oidc/oidc.go b/connector/oidc/oidc.go
index cd04a3747f59cd7b045e43f452ef944f2d08c66a..b4a02bc71340f4a59e221e954570cb75562a42db 100644
--- a/connector/oidc/oidc.go
+++ b/connector/oidc/oidc.go
@@ -10,8 +10,8 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/go-oidc"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/oauth2"
 
 	"github.com/coreos/dex/connector"
diff --git a/connector/oidc/oidc_test.go b/connector/oidc/oidc_test.go
index a484d0a2f78139c90ea112b50de55841035b9e82..305ab2ce99ee4e01dbbb5b3d85646ec2c50c501c 100644
--- a/connector/oidc/oidc_test.go
+++ b/connector/oidc/oidc_test.go
@@ -1,8 +1,8 @@
 package oidc
 
 import (
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/connector"
+	"github.com/sirupsen/logrus"
 	"net/url"
 	"os"
 	"reflect"
diff --git a/connector/saml/saml.go b/connector/saml/saml.go
index fad270c62c96aec7d2e3e2c4621b271d47e20c30..706ba95b125d23ab12905ea4d6be6543516c9d7f 100644
--- a/connector/saml/saml.go
+++ b/connector/saml/saml.go
@@ -12,10 +12,10 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/beevik/etree"
 	dsig "github.com/russellhaering/goxmldsig"
 	"github.com/russellhaering/goxmldsig/etreeutils"
+	"github.com/sirupsen/logrus"
 
 	"github.com/coreos/dex/connector"
 )
diff --git a/connector/saml/saml_test.go b/connector/saml/saml_test.go
index 2d73ff5007dd29d4ba72bddb3f8cd6c73fa32c06..37cda8c3b71bf0c4c110043fe2b1404d6c9857ea 100644
--- a/connector/saml/saml_test.go
+++ b/connector/saml/saml_test.go
@@ -10,9 +10,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/kylelemons/godebug/pretty"
 	dsig "github.com/russellhaering/goxmldsig"
+	"github.com/sirupsen/logrus"
 
 	"github.com/coreos/dex/connector"
 )
diff --git a/glide.yaml b/glide.yaml
index 6fff9565e8ffddb8caf056af444a1d2843238606..9b55ef1833829cd7d9aa24e925b91eac22efc2d9 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -74,7 +74,7 @@ import:
   version: c97913dcbd76de40b051a9b4cd827f7eaeb7a868
 - package: golang.org/x/oauth2
   version: 08c8d727d2392d18286f9f88ad775ad98f09ab33
-  subpackages: []
+
 # The oauth2 package only imports the appengine code when it's given a
 # specific build tags, but glide detects it anyway.
 #
@@ -92,10 +92,10 @@ import:
 
 # Testing conveniences.
 - package: github.com/kylelemons/godebug
+  version: eadb3ce320cbab8393bea5ca17bebac3f78a021b
   subpackages:
   - diff
   - pretty
-  version: eadb3ce320cbab8393bea5ca17bebac3f78a021b
 
 # SQL drivers
 - package: github.com/mattn/go-sqlite3
@@ -131,10 +131,12 @@ import:
   version: 411e09b969b1170a9f0c467558eb4c4c110d9c77
 
 # Structured logging
-- package: github.com/Sirupsen/logrus
-  version: v0.11.0
-- package: golang.org/x/sys/unix
+- package: github.com/sirupsen/logrus
+  version: v1.0.2
+- package: golang.org/x/sys
   version: 833a04a10549a95dc34458c195cbad61bbb6cb4d
+  subpackages:
+  - unix
 
 # XML signature validation for SAML connector
 - package: github.com/russellhaering/goxmldsig
diff --git a/server/api.go b/server/api.go
index ae1fe9497b82f94ed98baf6deeb25e8f78fc1e82..c6a9731f61d56c883885dfbdc2a243a535f39f2d 100644
--- a/server/api.go
+++ b/server/api.go
@@ -10,11 +10,11 @@ import (
 	// https://github.com/grpc/grpc-go/issues/711
 	"golang.org/x/net/context"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/api"
 	"github.com/coreos/dex/server/internal"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/version"
+	"github.com/sirupsen/logrus"
 )
 
 // apiVersion increases every time a new call is added to the API. Clients should use this info
diff --git a/server/api_test.go b/server/api_test.go
index 8fd09639cd496a591d1475155f66906ad3f86b1e..3c35403c27b22ed352f6b64a886c3ad3bef2ce2d 100644
--- a/server/api_test.go
+++ b/server/api_test.go
@@ -7,11 +7,11 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/api"
 	"github.com/coreos/dex/server/internal"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/memory"
+	"github.com/sirupsen/logrus"
 	"google.golang.org/grpc"
 )
 
diff --git a/server/rotation.go b/server/rotation.go
index 076d3ddc88c28573c89e5cbc021cfee43709de0c..a628bfa7c7bd6f2655c5fda99c18f7c8fedd275d 100644
--- a/server/rotation.go
+++ b/server/rotation.go
@@ -12,8 +12,8 @@ import (
 
 	"gopkg.in/square/go-jose.v2"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
+	"github.com/sirupsen/logrus"
 )
 
 var errAlreadyRotated = errors.New("keys already rotated by another server instance")
diff --git a/server/rotation_test.go b/server/rotation_test.go
index 5d6c18b2d563cf8e8ee8e3c458a86d6bdd7839b9..9d236b707ceeffa34e64946d70586c5ca31afd37 100644
--- a/server/rotation_test.go
+++ b/server/rotation_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/memory"
+	"github.com/sirupsen/logrus"
 )
 
 func signingKeyID(t *testing.T, s storage.Storage) string {
diff --git a/server/server.go b/server/server.go
index 829de4c2dd647716b63165a9dd8a6d36e746513b..e78a33c1f1c71018aebad7c53c05957eef26e427 100644
--- a/server/server.go
+++ b/server/server.go
@@ -14,9 +14,9 @@ import (
 
 	"golang.org/x/crypto/bcrypt"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
+	"github.com/sirupsen/logrus"
 
 	"github.com/coreos/dex/connector"
 	"github.com/coreos/dex/connector/github"
diff --git a/server/server_test.go b/server/server_test.go
index 844c7f7b47c598b8b6e72672d2a22e8e240151d2..cb7bbc0a759abb3af05df011b007c3f2123d9dcc 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -21,9 +21,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	oidc "github.com/coreos/go-oidc"
 	"github.com/kylelemons/godebug/pretty"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/bcrypt"
 	"golang.org/x/oauth2"
 	jose "gopkg.in/square/go-jose.v2"
diff --git a/storage/kubernetes/client.go b/storage/kubernetes/client.go
index f61c37dbae653289afa4294eaef79299bbb51e02..ccdb895c2255693d4026519f070133ea66ea9c62 100644
--- a/storage/kubernetes/client.go
+++ b/storage/kubernetes/client.go
@@ -22,9 +22,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/ghodss/yaml"
 	"github.com/gtank/cryptopasta"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/net/http2"
 
 	"github.com/coreos/dex/storage"
diff --git a/storage/kubernetes/storage.go b/storage/kubernetes/storage.go
index ce7c58fe23d98ddb9fe9f4e22b6f31eeb78f5e1b..15f7e3a926940e0a98d40579da460f9624ab30b0 100644
--- a/storage/kubernetes/storage.go
+++ b/storage/kubernetes/storage.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/kubernetes/k8sapi"
+	"github.com/sirupsen/logrus"
 )
 
 const (
diff --git a/storage/kubernetes/storage_test.go b/storage/kubernetes/storage_test.go
index 2addd12ee3352509c6f0f2e4cdbc96b770c7a2f1..58340f70577667434ec09e7a49b58e6ae7cf1e3f 100644
--- a/storage/kubernetes/storage_test.go
+++ b/storage/kubernetes/storage_test.go
@@ -5,9 +5,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/conformance"
+	"github.com/sirupsen/logrus"
 )
 
 const testKubeConfigEnv = "DEX_KUBECONFIG"
diff --git a/storage/memory/memory.go b/storage/memory/memory.go
index 97940c0e8df9355ae36f0c2b5d9f433b810e9a7a..90d3d85a4f9807c2f48a6e73f3ca743594d7f4c7 100644
--- a/storage/memory/memory.go
+++ b/storage/memory/memory.go
@@ -6,8 +6,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
+	"github.com/sirupsen/logrus"
 )
 
 // New returns an in memory storage.
diff --git a/storage/memory/memory_test.go b/storage/memory/memory_test.go
index aab63ffc5c474a0a13bb675b58b711f8fa2abc55..6628e50ccb456e7bc76a900b7bd65c3601380a12 100644
--- a/storage/memory/memory_test.go
+++ b/storage/memory/memory_test.go
@@ -4,9 +4,9 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/conformance"
+	"github.com/sirupsen/logrus"
 )
 
 func TestStorage(t *testing.T) {
diff --git a/storage/memory/static_test.go b/storage/memory/static_test.go
index b29b5ea908d8ba2344f48f6bc5b3fdb59f984564..17ddf7c833f157f936cdea8f5c7fbebd2cf64212 100644
--- a/storage/memory/static_test.go
+++ b/storage/memory/static_test.go
@@ -6,8 +6,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
+	"github.com/sirupsen/logrus"
 )
 
 func TestStaticClients(t *testing.T) {
diff --git a/storage/sql/config.go b/storage/sql/config.go
index 56ee0c1a290526ef87bb5418c084491b51dc99b4..2a70234fe90666592c0c9474b4ac9b79872b6434 100644
--- a/storage/sql/config.go
+++ b/storage/sql/config.go
@@ -6,10 +6,10 @@ import (
 	"net/url"
 	"strconv"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/lib/pq"
 	sqlite3 "github.com/mattn/go-sqlite3"
+	"github.com/sirupsen/logrus"
 )
 
 const (
diff --git a/storage/sql/config_test.go b/storage/sql/config_test.go
index a91195ccfb610456ed3497a5346ae0d6648391b3..13b2508e4c8f7f69fd467ccd08e909a9e4dc18be 100644
--- a/storage/sql/config_test.go
+++ b/storage/sql/config_test.go
@@ -7,9 +7,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/coreos/dex/storage"
 	"github.com/coreos/dex/storage/conformance"
+	"github.com/sirupsen/logrus"
 )
 
 func withTimeout(t time.Duration, f func()) {
diff --git a/storage/sql/migrate_test.go b/storage/sql/migrate_test.go
index 0e9e0179051310ab4da27887cadaf7b5819d3799..e94e819f0c2ef034babbf68ec040c0c74f444d5e 100644
--- a/storage/sql/migrate_test.go
+++ b/storage/sql/migrate_test.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/Sirupsen/logrus"
 	sqlite3 "github.com/mattn/go-sqlite3"
+	"github.com/sirupsen/logrus"
 )
 
 func TestMigrate(t *testing.T) {
diff --git a/storage/sql/sql.go b/storage/sql/sql.go
index 2c6b74bc90c7ca2be72f6b4ec362b2c032443b35..c0407887c93cddce027c9327f69ea225c8dd9361 100644
--- a/storage/sql/sql.go
+++ b/storage/sql/sql.go
@@ -6,8 +6,8 @@ import (
 	"regexp"
 	"time"
 
-	"github.com/Sirupsen/logrus"
 	"github.com/cockroachdb/cockroach-go/crdb"
+	"github.com/sirupsen/logrus"
 
 	// import third party drivers
 	_ "github.com/go-sql-driver/mysql"