diff --git a/db/db.go b/db/db.go
index 0d3441ea..aeb00085 100644
--- a/db/db.go
+++ b/db/db.go
@@ -188,7 +188,7 @@ func (e *executor) execute(quit <-chan bool, send chan<- *Response) {
 		}
 	}()
 
-	// If we have paniced during query execution
+	// If we have panicked during query execution
 	// then ensure that we recover from the error
 	// and print the error to the log.
 
diff --git a/sql/options.go b/sql/options.go
index d87fe141..ec18a10b 100644
--- a/sql/options.go
+++ b/sql/options.go
@@ -66,7 +66,7 @@ func (o *options) get(kind int) (kv, ns, db string, err error) {
 func (o *options) ns(ns string) (err error) {
 
 	// Check to see that the current user has
-	// the necessary authentcation privileges
+	// the necessary authentication privileges
 	// to be able to specify this namespace.
 
 	if o.auth.Possible.NS != "*" && o.auth.Possible.NS != ns {
@@ -86,7 +86,7 @@ func (o *options) ns(ns string) (err error) {
 func (o *options) db(db string) (err error) {
 
 	// Check to see that the current user has
-	// the necessary authentcation privileges
+	// the necessary authentication privileges
 	// to be able to specify this namespace.
 
 	if o.auth.Possible.DB != "*" && o.auth.Possible.DB != db {