diff --git a/base.pom.xml b/base.pom.xml
index c6643ee761f..bc808309a6c 100644
--- a/base.pom.xml
+++ b/base.pom.xml
@@ -291,6 +291,20 @@
                     </execution>
                 </executions>
             </plugin>
+            
+            <!-- We don't use the site plugin for anything except where we use the generated
+                 documentation for the liquibase-maven-plugin. This custom template is much
+                 simplified from the default template and allows us to just use Jekyll's
+                 include_relative instruction to include the generated pages in our markdown
+                 pages. -->
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-site-plugin</artifactId>
+              <version>3.8.2</version>
+              <configuration>
+                <templateFile>${maven.multiModuleProjectDirectory}/maven-site.vm</templateFile>
+              </configuration>
+            </plugin>            
         </plugins>
 
         <pluginManagement>
@@ -309,7 +323,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.7.1</version>
+                    <version>3.8.2</version>
                 </plugin>
 
                 <plugin>
diff --git a/default-site-macros.vm b/default-site-macros.vm
new file mode 100644
index 00000000000..f64250e5a19
--- /dev/null
+++ b/default-site-macros.vm
@@ -0,0 +1,494 @@
+## Licensed to the Apache Software Foundation (ASF) under one
+## or more contributor license agreements.  See the NOTICE file
+## distributed with this work for additional information
+## regarding copyright ownership.  The ASF licenses this file
+## to you under the Apache License, Version 2.0 (the
+## "License"); you may not use this file except in compliance
+## with the License.  You may obtain a copy of the License at
+##
+##     http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing,
+## software distributed under the License is distributed on an
+## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+## KIND, either express or implied.  See the License for the
+## specific language governing permissions and limitations
+## under the License.
+##
+#macro ( link $href $name $target $img $position $alt $border $width $height $title )
+#**##set ( $linkTitle = ' title="' + $name + '"' )
+#**##if( $target )
+#*  *##set ( $linkTarget = ' target="' + $target + '"' )
+#**##else
+#*  *##set ( $linkTarget = "" )
+#**##end
+#**##if ( $decoration.isLink( $href ) )
+#*  *##set ( $linkClass = ' class="externalLink"' )
+#**##else
+#*  *##set ( $linkClass = "" )
+#**##end
+#**##if ( $img )
+#*  *##if ( $position == "left" )
+#*    *#<a href="$href"$linkClass$linkTarget$linkTitle>#image($img $alt $border $width $height $title)$name</a>##
+#*  *##else
+#*    *#<a href="$href"$linkClass$linkTarget$linkTitle>$name #image($img $alt $border $width $height $title)</a>##
+#*  *##end
+#**##else
+#*  *#<a href="$href"$linkClass$linkTarget$linkTitle>$name</a>##
+#**##end
+#end
+##
+#macro ( image $img $alt $border $width $height $title )
+#**##if( $img )
+#*  *##if ( !$decoration.isLink( $img ) )
+#*    *##set ( $imgSrc = $PathTool.calculateLink( $img, $relativePath ) )
+#*    *##set ( $imgSrc = $imgSrc.replaceAll( '\\', '/' ) )
+#*    *##set ( $imgSrc = ' src="' + $imgSrc + '"' )
+#*  *##else
+#*    *##set ( $imgSrc = ' src="' + $img + '"' )
+#*  *##end
+#*  *##if( $alt )
+#*    *##set ( $imgAlt = ' alt="' + $alt + '"' )
+#*  *##else
+#*    *##set ( $imgAlt = ' alt=""' )
+#*  *##end
+#*  *##if( $border )
+#*    *##set ( $imgBorder = ' border="' + $border + '"' )
+#*  *##else
+#*    *##set ( $imgBorder = "" )
+#*  *##end
+#*  *##if( $width )
+#*    *##set ( $imgWidth = ' width="' + $width + '"' )
+#*  *##else
+#*    *##set ( $imgWidth = "" )
+#*  *##end
+#*  *##if( $height )
+#*    *##set ( $imgHeight = ' height="' + $height + '"' )
+#*  *##else
+#*    *##set ( $imgHeight = "" )
+#*  *##end
+#*  *##if( $title )
+#*    *##set ( $imgTitle = ' title="' + $title + '"' )
+#*  *##else
+#*    *##set ( $imgTitle = "" )
+#*  *##end
+#*  *#<img class="imageLink"$imgSrc$imgAlt$imgBorder$imgWidth$imgHeight$imgTitle/>##
+#**##end
+#end
+##
+#macro ( banner $banner $id )
+#**##if ( $banner )
+#*  *##if( $banner.href )
+#*    *##set ( $hrf = $banner.href )
+#*    *##if ( !$decoration.isLink( $hrf ) )
+#*      *##set ( $hrf = $PathTool.calculateLink( $hrf, $relativePath ) )
+#*      *##set ( $hrf = $hrf.replaceAll( '\\', '/' ) )
+#*      *##if ( ( $hrf == '' ) )
+#*        *##set ( $hrf = './' )
+#*      *##end
+#*    *##end
+#*    *#<a href="$hrf" id="$id"#if( $banner.alt ) title="$banner.alt"#end>##
+#*  *##else
+#*    *#<div id="$id">##
+#*  *##end
+##
+#*  *##if( $banner.src )
+#*    *##set ( $src = $banner.src )
+#*      *##if ( !$decoration.isLink( $src ) )
+#*        *##set ( $src = $PathTool.calculateLink( $src, $relativePath ) )
+#*        *##set ( $src = $src.replaceAll( '\\', '/' ) )
+#*      *##end
+#*      *##if ( $banner.alt )
+#*        *##set ( $alt = ' alt="' + $banner.alt + '"' )
+#*      *##elseif ( $banner.name )
+#*        *##set ( $alt = ' alt="' + $banner.name + '"' )
+#*      *##else
+#*        *##set ( $alt = ' alt=""' )
+#*      *##end
+#*      *##if( $banner.border )
+#*        *##set ( $imgBorder = ' border="' + $banner.border + '"' )
+#*      *##else
+#*        *##set ( $imgBorder = "" )
+#*      *##end
+#*      *##if( $banner.width )
+#*        *##set ( $imgWidth = ' width="' + $banner.width + '"' )
+#*      *##else
+#*        *##set ( $imgWidth = "" )
+#*      *##end
+#*      *##if( $banner.height )
+#*        *##set ( $imgHeight = ' height="' + $banner.height + '"' )
+#*      *##else
+#*        *##set ( $imgHeight = "" )
+#*      *##end
+#*      *##if( $banner.title )
+#*        *##set ( $bannerTitle=' title="' + $banner.title + '"' )
+#*      *##else
+#*      *##set ( $bannerTitle="" )
+#*    *##end
+#*    *#<img src="$src" $alt$bannerTitle$imgBorder$imgWidth$imgHeight/>##
+#*  *##else
+#*    *#$banner.name
+#*  *##end
+##
+#*  *##if( $banner.href )
+#*    *#</a>##
+#*  *##else
+#*    *#</div>
+#*  *##end
+#**##end
+#end
+##
+#macro ( links $links )
+#**##set ( $counter = 0 )
+#**##foreach( $item in $links )
+#*  *##set ( $counter = $counter + 1 )
+#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#*  *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
+#*  *##if ( $links.size() > $counter )
+#*  *# |
+#*  *##end
+#**##end
+#end
+##
+#macro ( breadcrumbs $breadcrumbs )
+#**##foreach( $item in $breadcrumbs )
+#*  *##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*  *##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+#*  *##if ( ( $currentItemHref == '' ) )
+#*    *##set ( $currentItemHref = './' )
+#*  *##end
+##
+#*  *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
+#**# &gt;
+#**##end
+#**#$shortTitle
+#**##if( $decoration.edit && $docRenderingContext.editable )
+#*  *# <a href="$docRenderingContext.getDoxiaSourcePath( $decoration.edit )">[edit]</a>
+#**##end
+#end
+##
+#macro ( displayTree $display $item )
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##foreach( $subitem in $item.items )
+#*    *##set ( $subitemHref = $PathTool.calculateLink( $subitem.href, $relativePath ) )
+#*    *##set ( $subitemHref = $subitemHref.replaceAll( '\\', '/' ) )
+##
+#*    *##if ( $alignedFileName == $subitemHref )
+#*      *##set ( $display = true )
+#*    *##end
+##
+#*    *##displayTree( $display $subitem )
+#*  *##end
+#**##end
+#end
+##
+#macro ( menuItem $item $indent )
+#**##set ( $collapseClass = "none" )
+#**##set ( $currentItemHref = $PathTool.calculateLink( $item.href, $relativePath ) )
+#**##set ( $currentItemHref = $currentItemHref.replaceAll( '\\', '/' ) )
+##
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##if ( $item.collapse == false )
+#*    *##set ( $collapseClass = "expanded" )
+#*  *##else
+#*    *### By default collapsed
+#*    *##set ( $collapseClass = "collapsed" )
+#*  *##end
+##
+#*  *##set ( $display = false )
+#*  *##displayTree( $display $item )
+##
+#*  *##if ( $alignedFileName == $currentItemHref || $display )
+#*    *##set ( $collapseClass = "expanded" )
+#*  *##end
+#**##end
+$indent     <li class="$collapseClass">##
+#**##if ( $item.img )
+#*  *##if ( $item.position == "left" )
+#*    *##if ( $alignedFileName == $currentItemHref )
+#*      *#<strong>#image($item.img $item.alt $item.border $item.width $item.height $item.title) $item.name</strong>
+#*    *##else
+#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title)
+#*    *##end
+#*  *##else
+#*    *##if ( $alignedFileName == $currentItemHref )
+#*      *#<strong>$item.name #image($item.img $item.alt $item.border $item.width $item.height $item.title)</strong>
+#*    *##else
+#*      *##link($currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title)
+#*    *##end
+#*  *##end
+#**##else
+#*  *##if ( $alignedFileName == $currentItemHref )
+#*    *#<strong>$item.name</strong>##
+#*  *##else
+#*    *##link( $currentItemHref $item.name $item.target $item.img $item.position $item.alt $item.border $item.width $item.height $item.title )
+#*  *##end
+#**##end
+#**##if ( $item && $item.items && $item.items.size() > 0 )
+#*  *##if ( $collapseClass == "expanded" )
+
+$indent      <ul>
+#*    *##foreach( $subitem in $item.items )
+#*      *##menuItem( $subitem "$indent  " )
+#*    *##end
+$indent      </ul>##
+#*  *##end
+#**##end
+#**#</li>
+#end
+##
+#macro ( mainMenu $menus )
+#**##foreach( $menu in $menus )
+#*  *##if ( $menu.name )
+#*    *##if ( $menu.img )
+#*      *##if( $menu.position )
+#*        *##set ( $position = $menu.position )
+#*      *##else
+#*        *##set ( $position = "left" )
+#*      *##end
+##
+#*      *##if ( !$decoration.isLink( $menu.img ) )
+#*        *##set ( $src = $PathTool.calculateLink( $menu.img, $relativePath ) )
+#*        *##set ( $src = $src.replaceAll( '\\', '/' ) )
+#*        *##set ( $src = ' src="' + $src + '"' )
+#*      *##else
+#*        *##set ( $src = ' src="' + $menu.img + '"' )
+#*      *##end
+##
+#*      *##if( $menu.alt )
+#*        *##set ( $alt = ' alt="' + $menu.alt + '"' )
+#*      *##else
+#*        *##set ( $alt = ' alt="' + $menu.name + '"' )
+#*      *##end
+##
+#*      *##if( $menu.border )
+#*        *##set ( $border = ' border="' + $menu.border + '"' )
+#*      *##else
+#*        *##set ( $border = ' border="0"' )
+#*      *##end
+##
+#*      *##if( $menu.width )
+#*        *##set ( $width = ' width="' + $menu.width + '"' )
+#*      *##else
+#*        *##set ( $width = "" )
+#*      *##end
+#*      *##if( $menu.height )
+#*        *##set ( $height = ' height="' + $menu.height + '"' )
+#*      *##else
+#*        *##set ( $height = "" )
+#*      *##end
+#*      *##if( $menu.title )
+#*        *##set ( $title = ' title="' + $menu.title + '"' )
+#*      *##else
+#*        *##set ( $title = "" )
+#*      *##end
+##
+#*      *##set ( $img = '<img class="imageLink"' + $src + $alt + $border + $width + $height + $title + "/>" )
+##
+#*      *##if ( $position == "left" )
+        <h5>$img $menu.name</h5>
+#*      *##else
+        <h5>$menu.name $img</h5>
+#*      *##end
+#*    *##else
+       <h5>$menu.name</h5>
+#*    *##end
+#*  *##end
+#*  *##if ( $menu.items && $menu.items.size() > 0 )
+    <ul>
+#*    *##foreach( $item in $menu.items )
+#*      *##menuItem( $item '' )
+#*    *##end
+    </ul>
+#*  *##end
+#**##end
+#end
+##
+#macro ( copyright )
+#**##if ( $project )
+#*  *##if ( ${project.organization} && ${project.organization.name} )
+#*    *##set ( $period = "" )
+#*  *##else
+#*    *##set ( $period = "." )
+#*  *##end
+##
+#*  *##set ( $currentYear = ${currentDate.year} + 1900 )
+##
+#*  *##if ( ${project.inceptionYear} && ( ${project.inceptionYear} != ${currentYear.toString()} ) )
+      ${project.inceptionYear}&#x2013;${currentYear}${period}##
+#*  *##else
+      ${currentYear}${period}##
+#*  *##end
+##
+#*  *##if ( ${project.organization} )
+#*    *##if ( ${project.organization.name} && ${project.organization.url} )
+#*      *#<a href="$project.organization.url">${project.organization.name}</a>.
+#*    *##elseif ( ${project.organization.name} )
+#*      *#${project.organization.name}.
+#*    *##end
+#*  *##end
+#**##end
+#end
+##
+#macro ( publishDate $position $decorationPublishDate $version )
+#**##if ( $publishDate )
+#*  *##set ( $dateValue = $dateFormat.format( $publishDate ) )
+#**##elseif ( $decoration.custom.getChild( 'publishDate' ) )
+#*  *##set ( $dateValue = $decoration.custom.getChild( 'publishDate' ).getValue() )
+#**##else
+#*  *##set ( $dateValue = $dateFormat.format( $currentDate ) )
+#**##end
+##
+#**##set ( $datePosition = $decorationPublishDate.position )
+#**##set ( $versionPosition = $version.position )
+##
+#**##set ( $breadcrumbs = $decoration.body.breadcrumbs )
+#**##set ( $links = $decoration.body.links )
+##
+#**##if ( $datePosition.equalsIgnoreCase( "right" ) && $links && $links.size() > 0 )
+#*  *##set ( $prefix = "&#xA0;|" )
+#**##else
+#*  *##set ( $prefix = "" )
+#**##end
+##
+#**##if ( $datePosition.equalsIgnoreCase( $position ) )
+#*  *##if ( ( $datePosition.equalsIgnoreCase( "right" ) ) || ( $datePosition.equalsIgnoreCase( "bottom" ) ) )
+        $prefix <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</span>
+#*    *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+        &#xA0;| <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*    *##end
+#*  *##elseif ( ( $datePosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $datePosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</span>
+#*      *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &#xA0;| <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*      *##end
+      </div>
+#*    *##elseif ( $datePosition.equalsIgnoreCase( "left" ) )
+      <div class="xleft">
+        <span id="publishDate">$i18n.getString( "site-renderer", $locale, "template.lastpublished" ): $dateValue</span>
+#*      *##if ( $versionPosition.equalsIgnoreCase( $position ) )
+          &#xA0;| <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*      *##end
+#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+#*      *##end
+      </div>
+#*  *##end
+#**##elseif ( $versionPosition.equalsIgnoreCase( $position ) )
+#*  *##if ( ( $versionPosition.equalsIgnoreCase( "right" ) ) || ( $versionPosition.equalsIgnoreCase( "bottom" ) ) )
+      $prefix <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*  *##elseif ( ( $versionPosition.equalsIgnoreCase( "navigation-bottom" ) ) || ( $versionPosition.equalsIgnoreCase( "navigation-top" ) ) )
+      <div id="lastPublished">
+        <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+      </div>
+#*  *##elseif ( $versionPosition.equalsIgnoreCase( "left" ) )
+      <div class="xleft">
+        <span id="projectVersion">$i18n.getString( "site-renderer", $locale, "template.version" ): ${project.version}</span>
+#*      *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+          | #breadcrumbs( $breadcrumbs )
+#*      *##end
+      </div>
+#*  *##end
+#**##elseif ( $position.equalsIgnoreCase( "left" ) )
+#*  *##if ( $breadcrumbs && $breadcrumbs.size() > 0 )
+      <div class="xleft">
+#*      *##breadcrumbs( $breadcrumbs )
+      </div>
+#*  *##end
+#**##end
+#end
+##
+#macro ( poweredByLogo $poweredBy )
+#**##if( $poweredBy )
+#*  *##foreach ($item in $poweredBy)
+#*    *##if( $item.href )
+#*      *##set ( $href = $PathTool.calculateLink( $item.href, $relativePath ) )
+#*      *##set ( $href = $href.replaceAll( '\\', '/' ) )
+#*    *##else
+#*      *##set ( $href="https://maven.apache.org/" )
+#*    *##end
+##
+#*    *##if( $item.name )
+#*      *##set ( $name = $item.name )
+#*    *##else
+#*      *##set ( $name = $i18n.getString( "site-renderer", $locale, "template.builtby" )  )
+#*      *##set ( $name = "${name} Maven"  )
+#*    *##end
+##
+#*    *##if( $item.img )
+#*      *##set ( $img = $item.img )
+#*    *##else
+#*      *##set ( $img = "images/logos/maven-feather.png" )
+#*    *##end
+##
+#*    *##if ( !$decoration.isLink( $img ) )
+#*      *##set ( $img = $PathTool.calculateLink( $img, $relativePath ) )
+#*      *##set ( $img = $img.replaceAll( '\\', '/' ) )
+#*    *##end
+##
+#*    *##if( $item.alt )
+#*      *##set ( $alt = ' alt="' + $item.alt + '"' )
+#*    *##else
+#*      *##set ( $alt = ' alt="' + $name + '"' )
+#*    *##end
+##
+#*    *##if( $item.border )
+#*      *##set ( $border = ' border="' + $item.border + '"' )
+#*    *##else
+#*      *##set ( $border = "" )
+#*    *##end
+##
+#*    *##if( $item.width )
+#*      *##set ( $width = ' width="' + $item.width + '"' )
+#*    *##else
+#*      *##set ( $width = "" )
+#*    *##end
+#*    *##if( $item.height )
+#*      *##set ( $height = ' height="' + $item.height + '"' )
+#*    *##else
+#*      *##set ( $height = "" )
+#*    *##end
+#*    *##if( $item.title )
+#*      *##set ( $title = ' title="' + $item.title + '"' )
+#*    *##else
+#*      *##set ( $title = "" )
+#*    *##end
+##
+      <a href="$href" title="$name" class="poweredBy">
+        <img class="poweredBy" $alt src="$img" $border $width $height $title />
+      </a>
+#*  *##end
+#*  *##if( $poweredBy.isEmpty() )
+      <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+        <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
+      </a>
+#*  *##end
+#**##else
+    <a href="http://maven.apache.org/" title="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" class="poweredBy">
+      <img class="poweredBy" alt="$i18n.getString( "site-renderer", $locale, "template.builtby" ) Maven" src="$relativePath/images/logos/maven-feather.png" />
+    </a>
+#**##end
+#end
+##
+#macro ( googleAnalytics $accountId )
+#**##if( $accountId && $accountId != "" )
+    <!-- Google Analytics -->
+    <script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+       (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+            m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+      ga('create', '$accountId', 'auto');
+      ga('send', 'pageview');
+      ga('set', 'anonymizeIp', true);
+      ga('set', 'forceSSL', true);
+    </script>
+#**##end
+#end
+##
+#macro( generatedBy )
+Apache Maven Doxia Site Renderer#if( $doxiaSiteRendererVersion ) $doxiaSiteRendererVersion#end##
+#end
+##
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncMojo.java
index 1e5be9fb05a..55001e39584 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncMojo.java
@@ -6,7 +6,7 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Marks all unapplied changes to the database as applied in the change log.
+ * <p>Marks all unapplied changes to the database as applied in the change log.</p>
  * 
  * @author JAmes Atwill
  * @goal changelogSync
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncSQLMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncSQLMojo.java
index 5e449bfcb50..0709526dc9a 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncSQLMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseChangeLogSyncSQLMojo.java
@@ -13,7 +13,7 @@
 import java.io.Writer;
 
 /**
- * Generates SQL that marks all unapplied changes as applied.
+ * <p>Generates SQL that marks all unapplied changes as applied.</p>
  * 
  * @author JAmes Atwill
  * @goal changelogSyncSQL
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseClearChecksumsMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseClearChecksumsMojo.java
index 159e4919970..b9ffc49aaac 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseClearChecksumsMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseClearChecksumsMojo.java
@@ -4,7 +4,7 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Clears all checksums in the current changelog, so they will be recalculated next update.
+ * <p>Clears all checksums in the current changelog, so they will be recalculated next update.</p>
  * 
  * @author Nathan Voxland
  * @goal clearCheckSums
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDBDocMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDBDocMojo.java
index 913f3a3eb33..3ec64e3c04e 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDBDocMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDBDocMojo.java
@@ -4,7 +4,7 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Generates dbDocs against the database.
+ * <p>Generates dbDocs against the database.</p>
  *
  * @author Ryan Connolly
  * @goal dbDoc
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java
index 9e134228584..c084ba3e628 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDatabaseDiff.java
@@ -22,8 +22,8 @@
 import java.io.IOException;
 
 /**
- * Generates a diff between the specified database and the reference database.
- * The output is either a report or a changelog depending on the value of the diffChangeLogFile parameter.
+ * <p>Generates a diff between the specified database and the reference database.
+ * The output is either a report or a changelog depending on the value of the diffChangeLogFile parameter.</p>
  *
  * @author Peter Murray
  * @goal diff
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDropAll.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDropAll.java
index 9aee658c87d..1329574557e 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDropAll.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseDropAll.java
@@ -8,7 +8,7 @@
 import java.util.List;
 
 /**
- * Drops all database objects in the configured schema(s). Note that functions, procedures and packages are not dropped.
+ * <p>Drops all database objects in the configured schema(s). Note that functions, procedures and packages are not dropped.</p>
  * 
  * @author Ferenc Gratzer
  * @description Liquibase DropAll Maven plugin
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseFutureRollbackSQL.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseFutureRollbackSQL.java
index 2179e328b8c..39b3eb198c5 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseFutureRollbackSQL.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseFutureRollbackSQL.java
@@ -14,7 +14,7 @@
 import java.io.Writer;
 
 /**
- * Generates the SQL that is required to rollback the database to current state after the next update.
+ * <p>Generates the SQL that is required to rollback the database to current state after the next update.</p>
  *
  * @description Liquibase FutureRollbackSQL Maven plugin
  * @goal futureRollbackSQL
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseGenerateChangeLogMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseGenerateChangeLogMojo.java
index 1cfe7998f04..37a8de192f6 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseGenerateChangeLogMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseGenerateChangeLogMojo.java
@@ -15,7 +15,8 @@
 import java.io.IOException;
 
 /**
- * Generates SQL that marks all unapplied changes as applied.
+ * <p>Generates a changelog based on the current database schema. Typically used when
+ * beginning to use Liquibase on an existing project and database schema.</p>
  *
  * @author Marcello Teodori
  * @goal generateChangeLog
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseListLocksMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseListLocksMojo.java
index b421bc24a50..e5fe7e0491f 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseListLocksMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseListLocksMojo.java
@@ -4,7 +4,7 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Lists all Liquibase updater locks on the current database.
+ * <p>Lists all Liquibase updater locks on the current database.</p>
  * 
  * @author JAmes Atwill
  * @goal listLocks
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReleaseLocksMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReleaseLocksMojo.java
index a0e1edf8779..45570885c84 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReleaseLocksMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReleaseLocksMojo.java
@@ -4,7 +4,7 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Removes any Liquibase updater locks from the current database.
+ * <p>Removes any Liquibase updater locks from the current database.</p>
  * 
  * @author JAmes Atwill
  * @goal releaseLocks
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReportStatusMojo.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReportStatusMojo.java
index ce35b05b637..2c59f167c53 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReportStatusMojo.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseReportStatusMojo.java
@@ -12,7 +12,7 @@
 import java.io.UnsupportedEncodingException;
 
 /**
- * Prints which changesets need to be applied to the database.
+ * <p>Prints which changesets need to be applied to the database.</p>
  * 
  * @author JAmes Atwill
  * @goal status
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollback.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollback.java
index fd5190bbe86..4a8dc698365 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollback.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollback.java
@@ -14,8 +14,9 @@
 import java.util.Date;
 
 /**
- * Invokes Liquibase rollbacks the database to the specified using
- * pointing attributes 'rollbackCount', 'rollbackTag' and/or 'rollbackDate'
+ * <p>Invokes Liquibase to rollback the database (and mark changesets as unapplied). The
+ * change sets to be rolled back are specified using attributes 'rollbackCount',
+ * 'rollbackTag' and/or 'rollbackDate'</p>
  * @author Peter Murray
  * @goal rollback
  */
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollbackSQL.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollbackSQL.java
index f39a38135b4..b98796392ce 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollbackSQL.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseRollbackSQL.java
@@ -14,8 +14,8 @@
 import java.text.ParseException;
 
 /**
- * Generates the SQL that is required to rollback the database using one or more of the specified
- * attributes 'rollbackCount', 'rollbackTag' and/or 'rollbackDate'
+ * <p>Generates the SQL that is required to rollback the database using one or more of the specified
+ * attributes 'rollbackCount', 'rollbackTag' and/or 'rollbackDate'</p>
  *
  * @description Liquibase RollbackSQL Maven plugin
  * @goal rollbackSQL
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseTag.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseTag.java
index 719c11c14ff..90f2ea930fd 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseTag.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseTag.java
@@ -5,7 +5,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 
 /**
- * Writes a Liquibase tag to the database.
+ * <p>Writes a Liquibase tag to the database.</p>
  * 
  * @author Peter Murray
  * @goal tag
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdate.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdate.java
index 7bcfdfafbae..ffd2754114f 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdate.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdate.java
@@ -6,8 +6,8 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Applies the DatabaseChangeLogs to the database. Useful as part of the build
- * process.
+ * <p>Applies the DatabaseChangeLogs to the database. Useful as part of the build
+ * process.</p>
  * 
  * @author Peter Murray
  * @description Liquibase Update Maven plugin
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateSQL.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateSQL.java
index 492b5a0a739..173c5078af2 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateSQL.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateSQL.java
@@ -13,8 +13,8 @@
 import java.io.Writer;
 
 /**
- * Generates the SQL that is required to update the database to the current
- * version as specified in the DatabaseChangeLogs.
+ * <p>Generates the SQL that is required to update the database to the current
+ * version as specified in the DatabaseChangeLogs.</p>
  * 
  * @author Peter Murray
  * @description Liquibase UpdateSQL Maven plugin
diff --git a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateTestingRollback.java b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateTestingRollback.java
index 087785476f3..5a5beb8f2a8 100644
--- a/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateTestingRollback.java
+++ b/liquibase-maven-plugin/src/main/java/org/liquibase/maven/plugins/LiquibaseUpdateTestingRollback.java
@@ -6,8 +6,8 @@
 import liquibase.exception.LiquibaseException;
 
 /**
- * Applies the DatabaseChangeLogs to the database, testing rollback. This is
- * done by updating the database, rolling it back then updating it again.
+ * <p>Applies the DatabaseChangeLogs to the database, testing rollback. This is
+ * done by updating the database, rolling it back then updating it again.</p>
  * 
  * @description Liquibase UpdateTestingRollback Maven plugin
  * @goal updateTestingRollback
diff --git a/maven-site.vm b/maven-site.vm
new file mode 100644
index 00000000000..622b0e10ea8
--- /dev/null
+++ b/maven-site.vm
@@ -0,0 +1,14 @@
+#parse( "default-site-macros.vm" )
+##
+<html xmlns="http://www.w3.org/1999/xhtml"#if ( $locale ) xml:lang="$locale.language" lang="$locale.language"#end>
+  <body class="composite">
+    <div id="bodyColumn">
+      <div id="contentBox">
+#*   *#$bodyContent
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+  </body>
+</html>