diff --git a/admin.go b/admin.go
index d897ac4..fce7044 100644
--- a/admin.go
+++ b/admin.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"net/http"
 	"strconv"
 	"strings"
diff --git a/cover.go b/cover.go
index 6ebd342..e2bb949 100644
--- a/cover.go
+++ b/cover.go
@@ -1,22 +1,24 @@
 package main
 
-import log "github.com/cihub/seelog"
-import _ "image/png"
-import _ "image/jpeg"
-import _ "image/gif"
-
 import (
+	_ "image/gif"
+	_ "image/jpeg"
+	_ "image/png"
+
+	log "github.com/cihub/seelog"
+
 	"bytes"
-	"git.gitorious.org/go-pkg/epubgo.git"
-	"git.gitorious.org/trantor/trantor.git/storage"
-	"github.com/gorilla/mux"
-	"github.com/nfnt/resize"
 	"image"
 	"image/jpeg"
 	"io"
 	"io/ioutil"
 	"regexp"
 	"strings"
+
+	"git.gitorious.org/go-pkg/epubgo.git"
+	"git.gitorious.org/trantor/trantor.git/storage"
+	"github.com/gorilla/mux"
+	"github.com/nfnt/resize"
 )
 
 func coverHandler(h handler) {
diff --git a/database/books.go b/database/books.go
index 6bef9d7..72728f8 100644
--- a/database/books.go
+++ b/database/books.go
@@ -1,11 +1,12 @@
 package database
 
 import (
+	"strings"
+	"unicode"
+
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 	"gopkgs.com/unidecode.v1"
-	"strings"
-	"unicode"
 )
 
 const (
diff --git a/database/database.go b/database/database.go
index 1b32c68..b98f8ef 100644
--- a/database/database.go
+++ b/database/database.go
@@ -1,12 +1,13 @@
 package database
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"errors"
+	"os"
+
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
-	"os"
 )
 
 const (
diff --git a/database/news.go b/database/news.go
index 9593a83..52fd9e9 100644
--- a/database/news.go
+++ b/database/news.go
@@ -1,9 +1,10 @@
 package database
 
 import (
+	"time"
+
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
-	"time"
 )
 
 const (
diff --git a/database/stats.go b/database/stats.go
index 6bb6ebb..8add666 100644
--- a/database/stats.go
+++ b/database/stats.go
@@ -1,9 +1,10 @@
 package database
 
 import (
+	"time"
+
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
-	"time"
 )
 
 const (
diff --git a/database/users.go b/database/users.go
index f5d01c5..2cc3561 100644
--- a/database/users.go
+++ b/database/users.go
@@ -1,12 +1,13 @@
 package database
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"bytes"
-	"code.google.com/p/go.crypto/scrypt"
 	"crypto/rand"
 	"errors"
+
+	"code.google.com/p/go.crypto/scrypt"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/reader.go b/reader.go
index bbd806e..0882a3c 100644
--- a/reader.go
+++ b/reader.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"bytes"
 	"io"
 	"io/ioutil"
diff --git a/session.go b/session.go
index 0f22e2f..4d772b6 100644
--- a/session.go
+++ b/session.go
@@ -2,10 +2,11 @@ package main
 
 import (
 	"encoding/hex"
+	"net/http"
+
 	"git.gitorious.org/trantor/trantor.git/database"
 	"github.com/gorilla/securecookie"
 	"github.com/gorilla/sessions"
-	"net/http"
 )
 
 var sesStore = sessions.NewCookieStore(securecookie.GenerateRandomKey(64))
diff --git a/stats.go b/stats.go
index 42eb6f7..5df8fb9 100644
--- a/stats.go
+++ b/stats.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"net/http"
 	"strconv"
 	"strings"
diff --git a/storage/dir.go b/storage/dir.go
index 066f0bb..2dde022 100644
--- a/storage/dir.go
+++ b/storage/dir.go
@@ -1,8 +1,8 @@
 package storage
 
-import p "path"
-
 import (
+	p "path"
+
 	"os"
 )
 
diff --git a/storage/storage.go b/storage/storage.go
index f84b3ab..b5f0ba0 100644
--- a/storage/storage.go
+++ b/storage/storage.go
@@ -1,8 +1,8 @@
 package storage
 
-import p "path"
-
 import (
+	p "path"
+
 	"io"
 	"os"
 )
diff --git a/tasker.go b/tasker.go
index b5e7d9d..ddf74c4 100644
--- a/tasker.go
+++ b/tasker.go
@@ -1,10 +1,11 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
-	"git.gitorious.org/trantor/trantor.git/database"
+	log "github.com/cihub/seelog"
+
 	"time"
+
+	"git.gitorious.org/trantor/trantor.git/database"
 )
 
 func InitTasks(db *database.DB) {
diff --git a/template.go b/template.go
index bf572d3..8bd60af 100644
--- a/template.go
+++ b/template.go
@@ -3,13 +3,14 @@ package main
 import (
 	txt_tmpl "text/template"
 
-	"git.gitorious.org/trantor/trantor.git/database"
 	log "github.com/cihub/seelog"
 
 	"encoding/json"
 	"errors"
 	"html/template"
 	"net/http"
+
+	"git.gitorious.org/trantor/trantor.git/database"
 )
 
 type Status struct {
diff --git a/trantor.go b/trantor.go
index 1393c58..0195bb6 100644
--- a/trantor.go
+++ b/trantor.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"io"
 	"net/http"
 	"os"
diff --git a/upload.go b/upload.go
index 9d9c5ba..743283f 100644
--- a/upload.go
+++ b/upload.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"bytes"
 	"crypto/rand"
 	"encoding/base64"
diff --git a/user.go b/user.go
index 2ba30c7..97e6868 100644
--- a/user.go
+++ b/user.go
@@ -1,8 +1,8 @@
 package main
 
-import log "github.com/cihub/seelog"
-
 import (
+	log "github.com/cihub/seelog"
+
 	"net/http"
 )