diff --git a/Cargo.toml b/Cargo.toml
index bc47ab3..ccd074b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,27 +1,27 @@
 [package]
 name = "teepee"
 version = "0.0.0"
-#readme = "README.md"
-authors = [ "Chris Morgan <me@chrismorgan.info>" ]
-#tags = ["web", "http", "library"]
+authors = ["Chris Morgan <me@chrismorgan.info>"]
+description = "HTTP library"
+#documentation = 
+#homepage = 
+repository = "https://github.com/teepee/teepee"
+readme = "README.md"
+keywords = ["web", "http", "library"]
+license = "MIT/Apache-2.0"
 
-[[lib]]
+[lib]
 name = "httpcommon"
 path = "src/httpcommon/lib.rs"
 
-[[lib]]
-name = "httpc"
-path = "src/httpc/lib.rs"
+#[[lib]]
+#name = "httpc"
+#path = "src/httpc/lib.rs"
+#
+#[[lib]]
+#name = "httpd"
+#path = "src/httpd/lib.rs"
 
-[[lib]]
-name = "httpd"
-path = "src/httpd/lib.rs"
-
-#[dependencies.openssl]
-#git = "https://github.com/sfackler/rust-openssl.git"
-
-[dependencies.phf]
-git = "https://github.com/sfackler/rust-phf.git"
-
-[dependencies.phf_mac]
-git = "https://github.com/sfackler/rust-phf.git"
+[dependencies]
+phf = "*"
+phf_mac = "*"
diff --git a/src/httpcommon/lib.rs b/src/httpcommon/lib.rs
index 193eeda..1463927 100644
--- a/src/httpcommon/lib.rs
+++ b/src/httpcommon/lib.rs
@@ -7,11 +7,6 @@
 //! should be exported in the root of the HTTP client crate ``httpc`` so that people can write
 //! ``httpc::status`` instead of ``httpcommon::status``.
 
-#![crate_name = "httpcommon"]
-#![comment = "Common HTTP functionality for the Teepee project"]
-#![license = "MIT/ASL2"]
-#![crate_type = "lib"]
-
 #![doc(html_logo_url = "http://teepee.rs/logo.100.png",
        html_root_url = "http://www.rust-ci.org/teepee/teepee/doc/")]