diff --git a/CHANGELOG.md b/CHANGELOG.md
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.2.1 - 2017-06-19
+
+* Export `formatDatabase` and `formatKey` from `Database.InfluxDB` for convenience
+
 ## v1.2.0 - 2017-06-19
 
 There are a lot of breaking changes in this release. The API has been cleaned up
diff --git a/influxdb.cabal b/influxdb.cabal
--- a/influxdb.cabal
+++ b/influxdb.cabal
@@ -1,5 +1,5 @@
 name: influxdb
-version: 1.2.0
+version: 1.2.1
 synopsis: Haskell client library for InfluxDB
 description:
   @influxdb@ is a Haskell client library for InfluxDB.
@@ -142,5 +142,5 @@
 
 source-repository this
   type: git
-  tag: v1.2.0
+  tag: v1.2.1
   location: https://github.com/maoe/influxdb-haskell.git
diff --git a/src/Database/InfluxDB.hs b/src/Database/InfluxDB.hs
--- a/src/Database/InfluxDB.hs
+++ b/src/Database/InfluxDB.hs
@@ -38,8 +38,8 @@
 
   -- ** Query construction
   -- $query-construction
-  , formatQuery
-  , (%)
+  , F.formatQuery
+  , (F.%)
 
   -- ** Query parameters
   , QueryParams
@@ -62,13 +62,15 @@
   -- * Common data types and classes
   , Precision(..)
   , Database
+  , F.formatDatabase
   , Key
+  , F.formatKey
 
   , Server
+  , defaultServer
   , host
   , port
   , ssl
-  , defaultServer
 
   , Credentials
   , credentials
@@ -84,13 +86,13 @@
   , HasManager(..)
   ) where
 
-import Database.InfluxDB.Format ((%), formatQuery)
 import Database.InfluxDB.JSON
 import Database.InfluxDB.Line
 import Database.InfluxDB.Manage (manage)
 import Database.InfluxDB.Query
 import Database.InfluxDB.Types
 import Database.InfluxDB.Write
+import qualified Database.InfluxDB.Format as F
 
 {- $intro
 = Getting started
diff --git a/src/Database/InfluxDB/Types.hs b/src/Database/InfluxDB/Types.hs
--- a/src/Database/InfluxDB/Types.hs
+++ b/src/Database/InfluxDB/Types.hs
@@ -109,10 +109,15 @@
 -- | Password to access InfluxDB
 password :: Lens' Credentials Text
 
--- | Database name
+-- | Database name.
+--
+-- 'Database.InfluxDB.formatDatabase' can be used to construct a
+-- 'Database'.
 newtype Database = Database { databaseName :: Text } deriving (Eq, Ord)
 
 -- | String type that is used for measurements, tag keys and field keys.
+--
+-- 'Database.InfluxDB.formatkey' can be used to construct a 'Key'.
 newtype Key = Key Text deriving (Eq, Ord)
 
 instance IsString Database where