diff -Nru doxia-maven-plugin-1.1.1/debian/changelog doxia-maven-plugin-1.1.4/debian/changelog
--- doxia-maven-plugin-1.1.1/debian/changelog	2010-03-13 13:34:05.000000000 +0000
+++ doxia-maven-plugin-1.1.4/debian/changelog	2011-09-11 15:38:10.000000000 +0000
@@ -1,3 +1,12 @@
+doxia-maven-plugin (1.1.4-1) unstable; urgency=low
+
+  * Newer but not newest upstream release
+  * Refresh patch and add a patch for maven-plugin-plugin.
+  * Update Standards-Version: 3.9.2.
+  * Improve short description.
+
+ -- Torsten Werner <twerner@debian.org>  Sat, 10 Sep 2011 14:38:22 +0200
+
 doxia-maven-plugin (1.1.1-3) unstable; urgency=low
 
   * Remove old patch because maven-repo-helper handles it correctly now.
diff -Nru doxia-maven-plugin-1.1.1/debian/control doxia-maven-plugin-1.1.4/debian/control
--- doxia-maven-plugin-1.1.1/debian/control	2010-03-13 13:34:13.000000000 +0000
+++ doxia-maven-plugin-1.1.4/debian/control	2011-09-11 15:37:55.000000000 +0000
@@ -9,7 +9,7 @@
  libmaven-plugin-tools-java (>= 2.5), libmaven-shade-plugin-java (>= 1.2.1),  
  libdoxia-java (>= 1.1.1), libmaven2-core-java, libplexus-utils-java, libmaven-doxia-tools-java,
  libitext1-java, libclirr-maven-plugin-java
-Standards-Version: 3.8.3
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-maven-plugin
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-maven-plugin/
 Homepage: http://maven.apache.org/doxia/doxia/doxia-maven-plugin
@@ -17,7 +17,7 @@
 Package: libdoxia-maven-plugin-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
-Description: A Maven plugin for Doxia
+Description: Maven plugin for Doxia
  Doxia is a content generation framework which aims to provide its users 
  with powerful techniques for generating static and dynamic content.
  .
diff -Nru doxia-maven-plugin-1.1.1/debian/patches/0001-debianize-parent-pom-version.patch doxia-maven-plugin-1.1.4/debian/patches/0001-debianize-parent-pom-version.patch
--- doxia-maven-plugin-1.1.1/debian/patches/0001-debianize-parent-pom-version.patch	2010-03-13 13:29:22.000000000 +0000
+++ doxia-maven-plugin-1.1.4/debian/patches/0001-debianize-parent-pom-version.patch	2011-09-11 15:37:55.000000000 +0000
@@ -1,20 +1,20 @@
 From: Torsten Werner <twerner@debian.org>
 Date: Sat, 13 Mar 2010 14:28:30 +0100
-Subject: [PATCH] debianize parent pom version
+Subject: debianize parent pom version
 
 ---
  pom.xml |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index dbc7c40..72f1a1d 100644
+index 9eca795..5332bd2 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -25,7 +25,7 @@ under the License.
    <parent>
      <groupId>org.apache.maven.doxia</groupId>
      <artifactId>doxia</artifactId>
--    <version>1.1.1</version>
+-    <version>1.1.4</version>
 +    <version>debian</version>
      <relativePath>../pom.xml</relativePath>
    </parent>
diff -Nru doxia-maven-plugin-1.1.1/debian/patches/0002-remove-version-from-maven-plugin-plugin.patch doxia-maven-plugin-1.1.4/debian/patches/0002-remove-version-from-maven-plugin-plugin.patch
--- doxia-maven-plugin-1.1.1/debian/patches/0002-remove-version-from-maven-plugin-plugin.patch	1970-01-01 00:00:00.000000000 +0000
+++ doxia-maven-plugin-1.1.4/debian/patches/0002-remove-version-from-maven-plugin-plugin.patch	2011-09-11 15:37:55.000000000 +0000
@@ -0,0 +1,21 @@
+From: Torsten Werner <twerner@debian.org>
+Date: Sat, 10 Sep 2011 14:34:45 +0200
+Subject: remove version from maven-plugin-plugin
+
+---
+ pom.xml |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 5332bd2..08a2a4f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -121,7 +121,6 @@ under the License.
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+           <artifactId>maven-plugin-plugin</artifactId>
+-          <version>2.5.1</version>
+         </plugin>
+         <plugin>
+           <groupId>org.apache.maven.plugins</groupId>
+-- 
diff -Nru doxia-maven-plugin-1.1.1/debian/patches/series doxia-maven-plugin-1.1.4/debian/patches/series
--- doxia-maven-plugin-1.1.1/debian/patches/series	2010-03-13 13:29:22.000000000 +0000
+++ doxia-maven-plugin-1.1.4/debian/patches/series	2011-09-11 15:37:55.000000000 +0000
@@ -1 +1,2 @@
 0001-debianize-parent-pom-version.patch
+0002-remove-version-from-maven-plugin-plugin.patch
diff -Nru doxia-maven-plugin-1.1.1/pom.xml doxia-maven-plugin-1.1.4/pom.xml
--- doxia-maven-plugin-1.1.1/pom.xml	2009-06-17 14:15:29.000000000 +0000
+++ doxia-maven-plugin-1.1.4/pom.xml	2010-11-16 20:09:26.000000000 +0000
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.maven.doxia</groupId>
     <artifactId>doxia</artifactId>
-    <version>1.1.1</version>
+    <version>1.1.4</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
@@ -92,6 +92,11 @@
       <artifactId>doxia-module-xhtml</artifactId>
       <version>${projectVersion}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <version>1.1.2</version>
+    </dependency>
 
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -101,6 +106,12 @@
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-doxia-tools</artifactId>
       <version>1.0.1</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven.doxia</groupId>
+          <artifactId>doxia-decoration-model</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 
@@ -110,12 +121,12 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.5</version>
+          <version>2.5.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>1.2</version>
+          <version>1.2.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -180,7 +191,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-plugin-plugin</artifactId>
-        <version>2.5</version>
+        <version>2.5.1</version>
       </plugin>
     </plugins>
   </reporting>
diff -Nru doxia-maven-plugin-1.1.1/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java doxia-maven-plugin-1.1.4/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java
--- doxia-maven-plugin-1.1.1/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java	2009-02-23 12:21:57.000000000 +0000
+++ doxia-maven-plugin-1.1.4/src/main/java/org/apache/maven/doxia/plugin/DoxiaRenderBooksMojo.java	2009-08-19 08:36:28.000000000 +0000
@@ -43,7 +43,7 @@
  *
  * @goal render-books
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
- * @version $Id: DoxiaRenderBooksMojo.java 746980 2009-02-23 12:21:57Z vsiveton $
+ * @version $Id: DoxiaRenderBooksMojo.java 805701 2009-08-19 08:36:28Z ltheussl $
  * @since 1.0
  */
 public class DoxiaRenderBooksMojo
@@ -85,14 +85,14 @@
     /**
      * Base directory of the project.
      *
-     * @parameter expression="${basedir}"
+     * @parameter default-value="${basedir}"
      */
     private File basedir;
 
     /**
      * Directory containing the generated project docs.
      *
-     * @parameter expression="${project.build.directory}/generated-site"
+     * @parameter default-value="${project.build.directory}/generated-site"
      */
     private File generatedDocs;
 
@@ -100,7 +100,7 @@
      * A comma separated list of locales supported by Maven. The first valid token will be the default Locale
      * for this instance of the Java Virtual Machine.
      *
-     * @parameter expression="${locales}"
+     * @parameter default-value="${locales}"
      */
     protected String locales;
 
diff -Nru doxia-maven-plugin-1.1.1/src/site/apt/index.apt doxia-maven-plugin-1.1.4/src/site/apt/index.apt
--- doxia-maven-plugin-1.1.1/src/site/apt/index.apt	2007-09-08 13:18:51.000000000 +0000
+++ doxia-maven-plugin-1.1.4/src/site/apt/index.apt	2009-08-08 13:49:04.000000000 +0000
@@ -4,6 +4,26 @@
  Lukas Theussl
  -----
 
+~~ 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.
+
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Introduction
 
  Doxia allows you to write books like user manuals and guides in any format supported by Doxia. Combined with the
@@ -14,16 +34,32 @@
 
  The Doxia Maven Plugin has one goal:
 
- * {{{render-books-mojo.html}doxia:render-books}} to create books in different output formats.
-
-* Usage
+ * {{{./render-books-mojo.html}doxia:render-books}} to create books in different output formats.
 
  First you need a simple book descriptor which is used to specify the layout of your book, i.e.
  the ordering of the sections and the names for the chapters.
  See {{{http://maven.apache.org/doxia/book/index.html}The Book Descriptor Reference}}
  for a reference to the descriptor.
 
- An example for configuring the Doxia Maven Plugin is found on the {{{./usage.html}usage}} page.
+* Usage
+
+  General instructions on how to use the Doxia Maven Plugin can be found on the {{{./usage.html}usage page}}. Some more
+  specific use cases are described in the examples given below. Last but not least, users occasionally contribute
+  additional examples, tips or errata to the
+  {{{http://docs.codehaus.org/display/MAVENUSER/PDF+Plugin}plugin's wiki page}}.
+
+  In case you still have questions regarding the plugin's usage, please have a look at the {{{./faq.html}FAQ}} and feel
+  free to contact the {{{./mail-lists.html}user mailing list}}. The posts to the mailing list are archived and could
+  already contain the answer to your question as part of an older thread. Hence, it is also worth browsing/searching
+  the {{{./mail-lists.html}mail archive}}.
+
+  If you feel like the plugin is missing a feature or has a defect, you can fill a feature request or bug report in our
+  {{{./issue-tracking.html}issue tracker}}. When creating a new issue, please provide a comprehensive description of your
+  concern. Especially for fixing bugs it is crucial that the developers can reproduce your problem. For this reason,
+  entire debug logs, POMs or most preferably little demo projects attached to the issue are very much appreciated.
+  Of course, patches are welcome, too. Contributors can check out the project from our
+  {{{./source-repository.html}source repository}} and will find supplementary information in the
+  {{{http://maven.apache.org/guides/development/guide-helping.html}guide to helping with Maven}}.
 
 * Examples
 
diff -Nru doxia-maven-plugin-1.1.1/src/site/apt/usage.apt doxia-maven-plugin-1.1.4/src/site/apt/usage.apt
--- doxia-maven-plugin-1.1.1/src/site/apt/usage.apt	2007-09-08 16:27:53.000000000 +0000
+++ doxia-maven-plugin-1.1.4/src/site/apt/usage.apt	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
- -----
- Usage
- -----
- Lukas Theussl
- -----
-
-Usage
-
- Below is a sample pom.xml illustrate how to use it.
-
-+------------------------------------------------------
-      <plugin>
-        <groupId>org.apache.maven.doxia</groupId>
-        <artifactId>doxia-maven-plugin</artifactId>
-        <version>1.0-alpha-9</version>
-        <executions>
-          <execution>
-            <phase>pre-site</phase>
-            <goals>
-              <goal>render-books</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <books>
-            <book>
-              <directory>src/books/example-book</directory>
-              <descriptor>src/books/example-book.xml</descriptor>
-              <formats>
-                <format>
-                  <id>latex</id>
-                </format>
-                <format>
-                  <id>xdoc</id>
-                </format>
-                <format>
-                  <id>pdf</id>
-                </format>
-                <format>
-                  <id>rtf</id>
-                </format>
-              </formats>
-            </book>
-          </books>
-        </configuration>
-      </plugin>
-+------------------------------------------------------
-
- See also the sample given on the main Doxia {{{http://maven.apache.org/doxia/book/index.html}site}}.
diff -Nru doxia-maven-plugin-1.1.1/src/site/apt/usage.apt.vm doxia-maven-plugin-1.1.4/src/site/apt/usage.apt.vm
--- doxia-maven-plugin-1.1.1/src/site/apt/usage.apt.vm	1970-01-01 00:00:00.000000000 +0000
+++ doxia-maven-plugin-1.1.4/src/site/apt/usage.apt.vm	2009-08-08 13:45:47.000000000 +0000
@@ -0,0 +1,49 @@
+ -----
+ Usage
+ -----
+ Lukas Theussl
+ -----
+
+Usage
+
+ Below is a sample pom.xml illustrate how to use it.
+
++------------------------------------------------------
+      <plugin>
+        <groupId>org.apache.maven.doxia</groupId>
+        <artifactId>doxia-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <executions>
+          <execution>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>render-books</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <books>
+            <book>
+              <directory>src/books/example-book</directory>
+              <descriptor>src/books/example-book.xml</descriptor>
+              <formats>
+                <format>
+                  <id>latex</id>
+                </format>
+                <format>
+                  <id>xdoc</id>
+                </format>
+                <format>
+                  <id>pdf</id>
+                </format>
+                <format>
+                  <id>rtf</id>
+                </format>
+              </formats>
+            </book>
+          </books>
+        </configuration>
+      </plugin>
++------------------------------------------------------
+
+ See also the sample given on the main Doxia {{{http://maven.apache.org/doxia/book/index.html}site}}.
diff -Nru doxia-maven-plugin-1.1.1/src/site/site.xml doxia-maven-plugin-1.1.4/src/site/site.xml
--- doxia-maven-plugin-1.1.1/src/site/site.xml	2008-11-02 13:57:04.000000000 +0000
+++ doxia-maven-plugin-1.1.4/src/site/site.xml	2009-08-08 13:49:04.000000000 +0000
@@ -21,7 +21,10 @@
  */
  -->
 
-<project name="Doxia">
+<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd"
+  name="Doxia Maven plugin">
 
   <body>