diff --git a/internal/dinosql/gen.go b/internal/dinosql/gen.go
index ada7670190..bf50c58cf1 100644
--- a/internal/dinosql/gen.go
+++ b/internal/dinosql/gen.go
@@ -243,6 +243,9 @@ func InterfaceImports(r Generateable, settings config.CombinedSettings) [][]stri
 	if uses("net.IP") {
 		std["net"] = struct{}{}
 	}
+	if uses("net.HardwareAddr") {
+		std["net"] = struct{}{}
+	}
 
 	pkg := make(map[string]struct{})
 	overrideTypes := map[string]string{}
@@ -298,6 +301,9 @@ func ModelImports(r Generateable, settings config.CombinedSettings) [][]string {
 	if UsesType(r, "net.IP", settings) {
 		std["net"] = struct{}{}
 	}
+	if UsesType(r, "net.HardwareAddr", settings) {
+		std["net"] = struct{}{}
+	}
 
 	// Custom imports
 	pkg := make(map[string]struct{})
@@ -693,6 +699,9 @@ func (r Result) goInnerType(col core.Column, settings config.CombinedSettings) s
 	case "inet":
 		return "net.IP"
 
+	case "macaddr", "macaddr8":
+		return "net.HardwareAddr"
+
 	case "void":
 		// A void value always returns NULL. Since there is no built-in NULL
 		// value into the SQL package, we'll use sql.NullBool
diff --git a/internal/endtoend/testdata/macaddr/go/db.go b/internal/endtoend/testdata/macaddr/go/db.go
new file mode 100644
index 0000000000..6a99519302
--- /dev/null
+++ b/internal/endtoend/testdata/macaddr/go/db.go
@@ -0,0 +1,29 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"context"
+	"database/sql"
+)
+
+type DBTX interface {
+	ExecContext(context.Context, string, ...interface{}) (sql.Result, error)
+	PrepareContext(context.Context, string) (*sql.Stmt, error)
+	QueryContext(context.Context, string, ...interface{}) (*sql.Rows, error)
+	QueryRowContext(context.Context, string, ...interface{}) *sql.Row
+}
+
+func New(db DBTX) *Queries {
+	return &Queries{db: db}
+}
+
+type Queries struct {
+	db DBTX
+}
+
+func (q *Queries) WithTx(tx *sql.Tx) *Queries {
+	return &Queries{
+		db: tx,
+	}
+}
diff --git a/internal/endtoend/testdata/macaddr/go/models.go b/internal/endtoend/testdata/macaddr/go/models.go
new file mode 100644
index 0000000000..0681470ceb
--- /dev/null
+++ b/internal/endtoend/testdata/macaddr/go/models.go
@@ -0,0 +1,12 @@
+// Code generated by sqlc. DO NOT EDIT.
+
+package querytest
+
+import (
+	"net"
+)
+
+type Foo struct {
+	Bar  bool
+	Addr net.HardwareAddr
+}
diff --git a/internal/endtoend/testdata/macaddr/go/query.sql.go b/internal/endtoend/testdata/macaddr/go/query.sql.go
new file mode 100644
index 0000000000..a2adf75b26
--- /dev/null
+++ b/internal/endtoend/testdata/macaddr/go/query.sql.go
@@ -0,0 +1,35 @@
+// Code generated by sqlc. DO NOT EDIT.
+// source: query.sql
+
+package querytest
+
+import (
+	"context"
+)
+
+const get = `-- name: Get :many
+SELECT bar, addr FROM foo LIMIT $1
+`
+
+func (q *Queries) Get(ctx context.Context, limit int32) ([]Foo, error) {
+	rows, err := q.db.QueryContext(ctx, get, limit)
+	if err != nil {
+		return nil, err
+	}
+	defer rows.Close()
+	var items []Foo
+	for rows.Next() {
+		var i Foo
+		if err := rows.Scan(&i.Bar, &i.Addr); err != nil {
+			return nil, err
+		}
+		items = append(items, i)
+	}
+	if err := rows.Close(); err != nil {
+		return nil, err
+	}
+	if err := rows.Err(); err != nil {
+		return nil, err
+	}
+	return items, nil
+}
diff --git a/internal/endtoend/testdata/macaddr/query.sql b/internal/endtoend/testdata/macaddr/query.sql
new file mode 100644
index 0000000000..f9edc95598
--- /dev/null
+++ b/internal/endtoend/testdata/macaddr/query.sql
@@ -0,0 +1,4 @@
+CREATE TABLE foo (bar bool not null, addr macaddr not null);
+
+-- name: Get :many
+SELECT bar, addr FROM foo LIMIT $1;
diff --git a/internal/endtoend/testdata/macaddr/sqlc.json b/internal/endtoend/testdata/macaddr/sqlc.json
new file mode 100644
index 0000000000..1161aac713
--- /dev/null
+++ b/internal/endtoend/testdata/macaddr/sqlc.json
@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "packages": [{
+    "path": "go",
+	"name": "querytest",
+	"schema": "query.sql",
+	"queries": "query.sql"
+  }]
+}
diff --git a/internal/endtoend/testdata/ondeck/schema.sql b/internal/endtoend/testdata/ondeck/schema.sql
index 62768b9e9a..e7c62c4c3c 100644
--- a/internal/endtoend/testdata/ondeck/schema.sql
+++ b/internal/endtoend/testdata/ondeck/schema.sql
@@ -7,7 +7,7 @@ CREATE TYPE status AS ENUM ('open', 'closed');
 
 CREATE TABLE venue (
     id               SERIAL primary key,
-	create_at        timestamp    not null,
+    create_at        timestamp    not null,
     status           status       not null,
     slug             text         not null,
     name             varchar(255) not null,