main.go    | 14 +++++++-------
 refresh.go | 12 ++++++------
 upload.go  |  2 +-

diff --git a/main.go b/main.go
index 3cb232b76d8b2fb732417d60c93079da2d2f0af1519994b374db664788532972..c3841a4c90de367e0db9a385c2910e1cefcac6fa5feffcf5dbdd39adc54c239a 100644
--- a/main.go
+++ b/main.go
@@ -151,7 +151,7 @@ 		os.Exit(1)
 	}
 	Root = flag.Args()[0]
 	if _, err := os.Stat(Root); err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 
 	if *FSCK {
@@ -178,7 +178,7 @@ 					os.O_RDONLY,
 					os.FileMode(0666),
 				)
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 				passwdReader(fd)
 				fd.Close()
@@ -194,7 +194,7 @@ 					os.O_WRONLY|os.O_APPEND,
 					os.FileMode(0666),
 				)
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 				passwdLister(fd)
 				fd.Close()
@@ -203,7 +203,7 @@ 		}()
 	}
 
 	if (*TLSCert != "" && *TLSKey == "") || (*TLSCert == "" && *TLSKey != "") {
-		log.Fatalln("Both -tls-cert and -tls-key are required")
+		log.Fatal("Both -tls-cert and -tls-key are required")
 	}
 
 	UmaskCur = syscall.Umask(0)
@@ -212,7 +212,7 @@
 	var err error
 	PyPIURLParsed, err = url.Parse(*PyPIURL)
 	if err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 	tlsConfig := tls.Config{
 		ClientSessionCache: tls.NewLRUClientSessionCache(16),
@@ -225,7 +225,7 @@ 	}
 	if *PyPICertHash != "" {
 		ourDgst, err := hex.DecodeString(*PyPICertHash)
 		if err != nil {
-			log.Fatalln(err)
+			log.Fatal(err)
 		}
 		tlsConfig.VerifyConnection = func(s tls.ConnectionState) error {
 			spki := s.VerifiedChains[0][0].RawSubjectPublicKeyInfo
@@ -253,7 +253,7 @@ 		ln := &UCSPI{}
 		server.ConnState = connStater
 		err := server.Serve(ln)
 		if _, ok := err.(UCSPIAlreadyAccepted); !ok {
-			log.Fatalln(err)
+			log.Fatal(err)
 		}
 		UCSPIJob.Wait()
 		return
diff --git a/refresh.go b/refresh.go
index def37c1f93c19c1afd5ff2abed114da399a0e70d9427e7c0fa087ed2dd3cfd33..411eccfc42dfbd706238abb2710b0cfaa8478405add0b59b1c702bb4869afcdd 100644
--- a/refresh.go
+++ b/refresh.go
@@ -72,7 +72,7 @@
 func agentedReq(url string) *http.Request {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
-		log.Fatalln(err)
+		log.Fatal(err)
 	}
 	req.Header.Set("User-Agent", UserAgent)
 	return req
@@ -148,7 +148,7 @@ 				if _, err = wr.WriteFields(recfile.Field{
 					Name:  MDFieldToRecField[recField],
 					Value: jsonField,
 				}); err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 			for _, m := range []RecFieldToValuesMap{
@@ -165,7 +165,7 @@ 					if _, err = wr.WriteFields(recfile.Field{
 						Name:  MDFieldToRecField[m.recField],
 						Value: v,
 					}); err != nil {
-						log.Fatalln(err)
+						log.Fatal(err)
 					}
 				}
 			}
@@ -204,7 +204,7 @@ 				if _, err = wr.WriteFields(recfile.Field{
 					Name:  MDFieldToRecField[recField],
 					Value: jsonField,
 				}); err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 
@@ -217,7 +217,7 @@ 					if _, err = wr.WriteFields(recfile.Field{
 						Name:  MDFieldToRecField[m.recField],
 						Value: v,
 					}); err != nil {
-						log.Fatalln(err)
+						log.Fatal(err)
 					}
 				}
 			}
@@ -229,7 +229,7 @@ 		if len(lines) > 0 {
 			if _, err = wr.WriteFieldMultiline(
 				MDFieldDescription, lines,
 			); err != nil {
-				log.Fatalln(err)
+				log.Fatal(err)
 			}
 		}
 
diff --git a/upload.go b/upload.go
index c66b46d0153c304434efab796c1897b38a2aa418ab56d958f52292d73c28cb85..d4ef79d6528a221f38add99fc1d681819c39eddebedece3c173b08cea45f0aa0 100644
--- a/upload.go
+++ b/upload.go
@@ -208,7 +208,7 @@ 						Value: lines[0],
 					})
 				}
 				if err != nil {
-					log.Fatalln(err)
+					log.Fatal(err)
 				}
 			}
 		}