diff --git a/.cirrus.yml b/.cirrus.yml
index 0bcf496..f14c80f 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -58,7 +58,8 @@ task:
   matrix:
     - name: "Go Lint $GOOS New$MODULES_NAME"
       env:
-        GOLANGCI_ARGS: "--new-from-rev=HEAD~"
+        # gci seems to be buggy with --new-from-rev=
+        GOLANGCI_ARGS: "--new-from-rev=HEAD~ --disable=gci"
     - name: "Go Lint $GOOS Mandatory$MODULES_NAME"
       env:
         # TODO: Re-enable dupword after ncdns issue #166 is fixed.
diff --git a/.golangci.yml b/.golangci.yml
index 5fe9f4c..4ab68aa 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -1,4 +1,9 @@
 linters-settings:
+  gci:
+    sections:
+      - standard
+      - default
+      - prefix(github.com/namecoin)
   goimports:
     local-prefixes: "github.com/namecoin"
   gomoddirectives: