diff --git a/artemis-distribution/src/main/assembly/source-assembly.xml b/artemis-distribution/src/main/assembly/source-assembly.xml
index 2f1dea7561..0eeb9e3d14 100644
--- a/artemis-distribution/src/main/assembly/source-assembly.xml
+++ b/artemis-distribution/src/main/assembly/source-assembly.xml
@@ -45,6 +45,10 @@
             <!-- Exclude all docs except user manual -->
             <exclude>docs/diagrams/</exclude>
 
+            <!-- Exclude stuff generated by the npm build -->
+            <exclude>artemis-website/node/</exclude>
+            <exclude>artemis-website/node_modules/</exclude>
+
             <!-- Exclude Release and Dev files -->
             <exclude>RELEASING.md</exclude>
             <exclude>ratReport.txt</exclude>
diff --git a/artemis-website/package.json b/artemis-website/package.json
index 16813c5d04..9bf826fa67 100644
--- a/artemis-website/package.json
+++ b/artemis-website/package.json
@@ -8,7 +8,6 @@
     "url": "https://github.com/apache/activemq-artemis"
   },
   "devDependencies": {
-      "gitbook": "~1.5.0",
       "gitbook-cli": "~0.3.6"
   }
 }
diff --git a/artemis-website/pom.xml b/artemis-website/pom.xml
index fd09c7b071..f29200b7d4 100644
--- a/artemis-website/pom.xml
+++ b/artemis-website/pom.xml
@@ -80,38 +80,15 @@
       <webapp-dir>${project.artifactId}-${project.version}</webapp-dir>
       <webapp-outdir-user-manual>${basedir}/target/classes/user-manual</webapp-outdir-user-manual>
       <webapp-outdir-hacking-guide>${basedir}/target/classes/hacking-guide</webapp-outdir-hacking-guide>
+
+      <frontend-maven-plugin-version>0.0.24</frontend-maven-plugin-version>
+      <nodeVersion>v0.10.32</nodeVersion>
+      <npmVersion>1.4.12</npmVersion>
+
    </properties>
 
    <build>
       <plugins>
-         <plugin>
-             <groupId>com.github.eirslett</groupId>
-             <artifactId>frontend-maven-plugin</artifactId>
-             <version>${frontend-maven-plugin-version}</version>
-             <executions>
-                 <execution>
-                     <id>install node and npm</id>
-                     <goals>
-                         <goal>install-node-and-npm</goal>
-                     </goals>
-                     <phase>generate-sources</phase>
-                     <configuration>
-                         <nodeVersion>v0.11.16</nodeVersion>
-                         <npmVersion>1.4.12</npmVersion>
-                     </configuration>
-                 </execution>
-                 <execution>
-                     <id>npm install</id>
-                     <goals>
-                         <goal>npm</goal>
-                     </goals>
-                     <phase>generate-sources</phase>
-                     <configuration>
-                         <arguments>install</arguments>
-                     </configuration>
-                 </execution>
-             </executions>
-         </plugin>
 
          <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
@@ -155,6 +132,34 @@
          <id>release</id>
          <build>
             <plugins>
+               <plugin>
+                  <groupId>com.github.eirslett</groupId>
+                  <artifactId>frontend-maven-plugin</artifactId>
+                  <version>${frontend-maven-plugin-version}</version>
+                  <executions>
+                     <execution>
+                        <id>install node and npm</id>
+                        <goals>
+                           <goal>install-node-and-npm</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                           <nodeVersion>${nodeVersion}</nodeVersion>
+                           <npmVersion>${npmVersion}</npmVersion>
+                        </configuration>
+                     </execution>
+                     <execution>
+                        <id>npm install</id>
+                        <goals>
+                           <goal>npm</goal>
+                        </goals>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                           <arguments>install</arguments>
+                        </configuration>
+                     </execution>
+                  </executions>
+               </plugin>
                <plugin>
                   <artifactId>maven-antrun-plugin</artifactId>
                   <version>1.6</version>
@@ -167,14 +172,14 @@
                                  <os family="windows" />
                               </condition>
                               <!-- lets generate the gitbook -->
-                              <mkdir dir="${webapp-outdir-user-manual}/gitbook" />
+                              <mkdir dir="${webapp-outdir-user-manual}" />
                               <echo>executing ${gitbook.cmd}</echo>
                               <exec executable="${gitbook.cmd}">
                                  <arg value="build" />
                                  <arg value="${basedir}/../docs/user-manual/en" />
                                  <arg value="${webapp-outdir-user-manual}" />
                               </exec>
-                              <mkdir dir="${webapp-outdir-hacking-guide}/gitbook" />
+                              <mkdir dir="${webapp-outdir-hacking-guide}" />
                               <echo>executing ${gitbook.cmd}</echo>
                               <exec executable="${gitbook.cmd}">
                                  <arg value="build" />
diff --git a/pom.xml b/pom.xml
index 6d8ebbed6c..def5ea2b94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,8 +97,6 @@
       <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
       <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-      <frontend-maven-plugin-version>0.0.24</frontend-maven-plugin-version>
-
      <!--
 
        note for idea users: