diff --git a/Cargo.toml b/Cargo.toml
index a3376a673..708810f58 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,7 +23,7 @@ default = ["std"]
 std = []
 # Enable JSON output in the `cli` example:
 json_example = ["serde_json", "serde"]
-visitor = ["sqlparser_derive"]
+visitor = ["sqlparser_procmacro"]
 
 [dependencies]
 bigdecimal = { version = "0.3", features = ["serde"], optional = true }
@@ -33,7 +33,7 @@ serde = { version = "1.0", features = ["derive"], optional = true }
 # of dev-dependencies because of
 # https://github.com/rust-lang/cargo/issues/1596
 serde_json = { version = "1.0", optional = true }
-sqlparser_derive = { version = "0.1", path = "derive", optional = true }
+sqlparser_procmacro = { version = "0.1", path = "procmacro", optional = true }
 
 [dev-dependencies]
 simple_logger = "4.0"
@@ -45,3 +45,7 @@ pretty_assertions = "1"
 # https://github.com/sunng87/cargo-release/blob/master/docs/reference.md#config-fields
 # See docs/releasing.md for details.
 publish = false
+
+[package.metadata.docs.rs]
+# Document these features on docs.rs
+features = ["serde", "visitor"]
diff --git a/derive/Cargo.toml b/procmacro/Cargo.toml
similarity index 78%
rename from derive/Cargo.toml
rename to procmacro/Cargo.toml
index 221437a9e..e24f22757 100644
--- a/derive/Cargo.toml
+++ b/procmacro/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
-name = "sqlparser_derive"
-description = "proc macro for sqlparser"
+name = "sqlparser_procmacro"
+description = "proc macros for sqlparser"
 version = "0.1.0"
-authors = ["Andy Grove <andygrove73@gmail.com>"]
+authors = ["sqlparser authors"]
 homepage = "https://github.com/sqlparser-rs/sqlparser-rs"
 documentation = "https://docs.rs/sqlparser/"
 keywords = ["ansi", "sql", "lexer", "parser"]
diff --git a/derive/README.md b/procmacro/README.md
similarity index 100%
rename from derive/README.md
rename to procmacro/README.md
diff --git a/derive/src/lib.rs b/procmacro/src/lib.rs
similarity index 100%
rename from derive/src/lib.rs
rename to procmacro/src/lib.rs
diff --git a/src/ast/data_type.rs b/src/ast/data_type.rs
index af8320d8f..b5d4f1df3 100644
--- a/src/ast/data_type.rs
+++ b/src/ast/data_type.rs
@@ -18,7 +18,7 @@ use core::fmt;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use crate::ast::ObjectName;
 
diff --git a/src/ast/ddl.rs b/src/ast/ddl.rs
index e5bee49ca..8947b3a8e 100644
--- a/src/ast/ddl.rs
+++ b/src/ast/ddl.rs
@@ -21,7 +21,7 @@ use core::fmt;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use crate::ast::value::escape_single_quote_string;
 use crate::ast::{display_comma_separated, display_separated, DataType, Expr, Ident, ObjectName};
diff --git a/src/ast/helpers/stmt_create_table.rs b/src/ast/helpers/stmt_create_table.rs
index 403d91131..a8e4b90ca 100644
--- a/src/ast/helpers/stmt_create_table.rs
+++ b/src/ast/helpers/stmt_create_table.rs
@@ -5,7 +5,7 @@ use alloc::{boxed::Box, format, string::String, vec, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use crate::ast::{
     ColumnDef, FileFormat, HiveDistributionStyle, HiveFormat, ObjectName, OnCommit, Query,
diff --git a/src/ast/mod.rs b/src/ast/mod.rs
index 80dff8504..0fcace669 100644
--- a/src/ast/mod.rs
+++ b/src/ast/mod.rs
@@ -23,7 +23,7 @@ use core::fmt;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 pub use self::data_type::{
     CharLengthUnits, CharacterLength, DataType, ExactNumberInfo, TimezoneInfo,
diff --git a/src/ast/operator.rs b/src/ast/operator.rs
index b8f371be3..6de09c507 100644
--- a/src/ast/operator.rs
+++ b/src/ast/operator.rs
@@ -19,7 +19,7 @@ use alloc::{string::String, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use super::display_separated;
 
diff --git a/src/ast/query.rs b/src/ast/query.rs
index 7a009c2ed..355abc493 100644
--- a/src/ast/query.rs
+++ b/src/ast/query.rs
@@ -17,7 +17,7 @@ use alloc::{boxed::Box, vec::Vec};
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use crate::ast::*;
 
diff --git a/src/ast/value.rs b/src/ast/value.rs
index e17f464cf..254754a26 100644
--- a/src/ast/value.rs
+++ b/src/ast/value.rs
@@ -21,7 +21,7 @@ use bigdecimal::BigDecimal;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 /// Primitive SQL values such as number and string
 #[derive(Debug, Clone, PartialEq, PartialOrd, Eq, Ord, Hash)]
diff --git a/src/keywords.rs b/src/keywords.rs
index 137692610..a7009dadc 100644
--- a/src/keywords.rs
+++ b/src/keywords.rs
@@ -28,7 +28,7 @@
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 /// Defines a string constant for a single keyword: `kw_def!(SELECT);`
 /// expands to `pub const SELECT = "SELECT";`
diff --git a/src/tokenizer.rs b/src/tokenizer.rs
index d74032657..807b4e244 100644
--- a/src/tokenizer.rs
+++ b/src/tokenizer.rs
@@ -32,7 +32,7 @@ use core::str::Chars;
 use serde::{Deserialize, Serialize};
 
 #[cfg(feature = "visitor")]
-use sqlparser_derive::Visit;
+use sqlparser_procmacro::Visit;
 
 use crate::dialect::SnowflakeDialect;
 use crate::dialect::{Dialect, MySqlDialect};