diff --git a/build/goimports.sh b/build/goimports.sh
index 6bc848e20e..29f7ea9112 100755
--- a/build/goimports.sh
+++ b/build/goimports.sh
@@ -13,4 +13,5 @@ find_files() {
 }
 
 GOFMT="gofmt -s -w";
+GOFMT="goimports -w";
 find_files | xargs $GOFMT;
\ No newline at end of file
diff --git a/consensus/consensus.go b/consensus/consensus.go
index be5e661c12..5774af1a78 100644
--- a/consensus/consensus.go
+++ b/consensus/consensus.go
@@ -18,12 +18,13 @@
 package consensus
 
 import (
+	"math/big"
+
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rpc"
-	"math/big"
 )
 
 // ChainReader defines a small collection of methods needed to access the local
diff --git a/swarm/fuse/fuse_dir.go b/swarm/fuse/fuse_dir.go
index 91b236ae8a..a7701985eb 100644
--- a/swarm/fuse/fuse_dir.go
+++ b/swarm/fuse/fuse_dir.go
@@ -19,12 +19,13 @@
 package fuse
 
 import (
-	"bazil.org/fuse"
-	"bazil.org/fuse/fs"
-	"golang.org/x/net/context"
 	"os"
 	"path/filepath"
 	"sync"
+
+	"bazil.org/fuse"
+	"bazil.org/fuse/fs"
+	"golang.org/x/net/context"
 )
 
 var (
diff --git a/swarm/fuse/swarmfs.go b/swarm/fuse/swarmfs.go
index 2493bdab19..e56d0ad4e3 100644
--- a/swarm/fuse/swarmfs.go
+++ b/swarm/fuse/swarmfs.go
@@ -17,9 +17,10 @@
 package fuse
 
 import (
-	"github.com/ethereum/go-ethereum/swarm/api"
 	"sync"
 	"time"
+
+	"github.com/ethereum/go-ethereum/swarm/api"
 )
 
 const (