diff --git a/docs/operations-guide/start.md b/docs/operations-guide/start.md
index 4160f00cf7599ea66cd317057597cd5b613f7dd0..35e07e3f58411b61b6d34118d5235c81dbb06b64 100644
--- a/docs/operations-guide/start.md
+++ b/docs/operations-guide/start.md
@@ -79,11 +79,20 @@ Step-by-step instructions on how to upgrade Metabase running on Heroku.
 
 # Configuring the Metabase Application Database
 
-The application database is where Metabase stores information about users, saved questions, dashboards, and any other data needed to run the application.  The default settings use an embedded H2 database, but this is configurable.
+The application database is where Metabase stores information about users, saved questions, dashboards, and any other
+data needed to run the application. The default settings use an embedded H2 database, but this is configurable.
 
-**NOTE:** you cannot change the application database while the application is running.  these values are read only once when the application starts up and will remain constant throughout the running of the application.
+##### Notes
+
+*  Using Metabase with an H2 application database is not recommended for production deployments. For production
+   deployments, we highly recommend using Postgres, MySQL, or MariaDB instead. If you decide to continue to use H2,
+   please be sure to back up the database file regularly.
+*  You cannot change the application database while the application is running. Connection configuration information is
+   read only once when the application starts up and will remain constant throughout the running of the application.
+*  Metabase provides limited support for migrating from H2 to Postgres or MySQL if you decide to upgrade to a more
+   production-ready database. See [Migrating from H2 to MySQL or
+   Postgres](#migrating-from-using-the-h2-database-to-mysql-or-postgres) for more details.
 
-**NOTE:** currently Metabase does not provide automated support for migrating data from one application database to another, so if you start with H2 and then want to move to Postgres you'll have to dump the data from H2 and import it into Postgres before relaunching the application.
 
 #### [H2](http://www.h2database.com/) (default)
 
diff --git a/src/metabase/db.clj b/src/metabase/db.clj
index d490bdaead395b04dc3ba72cf675671b057d0463..a2a16c12ce93a803bb8aa8150e9584dc99953491 100644
--- a/src/metabase/db.clj
+++ b/src/metabase/db.clj
@@ -97,7 +97,7 @@
      (log/warn
       (u/format-color 'red
           (str
-           (trs "WARNING: Using Metabase with an H2 application database is not recomended for production deployments.")
+           (trs "WARNING: Using Metabase with an H2 application database is not recommended for production deployments.")
            " "
            (trs "For production deployments, we highly recommend using Postgres, MySQL, or MariaDB instead.")
            " "