diff --git a/build.gradle b/build.gradle
new file mode 100644
index 00000000..01630d06
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'se.mtm.artifactory-rpm'
+
+buildscript {
+    repositories {
+        maven {
+            url "http://artifactory.mtm.se:8081/artifactory/libs-both"
+        }
+    }
+    dependencies {
+        classpath 'se.mtm.gradle:gradle-artifactory-rpm-plugin:1.0.11'
+    }
+}
+
+artifactoryRpm {
+	distributionDir = "target/rpm/pipeline2/RPMS/x86_64"
+}
+
+task wrapper(type: Wrapper) {
+    gradleVersion = '2.3'
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000..b7612167
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000..da62ebc5
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Apr 20 13:48:15 CEST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-all.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 00000000..91a7e269
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 00000000..8a0b282a
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/pom.xml b/pom.xml
index d9ac3e0e..296c7301 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   </parent>
   <groupId>org.daisy.pipeline</groupId>
   <artifactId>assembly</artifactId>
-  <version>1.9.10-SNAPSHOT</version>
+  <version>1.9.13</version>
   <packaging>pom</packaging>
   <name>DAISY Pipeline 2 :: Assembly</name>
   <description>Builds the main distribution of the DAISY Pipeline 2.</description>
@@ -65,7 +65,7 @@
       <dependency>
         <groupId>org.daisy.pipeline.modules.braille</groupId>
         <artifactId>braille-modules-bom</artifactId>
-        <version>1.9.10-SNAPSHOT</version>
+        <version>1.9.13</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -90,6 +90,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>org.daisy.pipeline.modules.braille</groupId>
+        <artifactId>mod-mtm</artifactId>
+        <version>1.6.0</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
   <build>
@@ -315,6 +320,11 @@
                   <artifactId>com.xmlcalabash</artifactId>
                   <version>1.0.23</version>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.daisy.libs</groupId>
+                  <artifactId>logback-osgi-adapter</artifactId>
+                  <version>1.0.0</version>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.daisy.libs</groupId>
                   <artifactId>saxon-he</artifactId>
@@ -839,6 +849,10 @@
                   <groupId>org.daisy.pipeline.modules</groupId>
                   <artifactId>zip-utils</artifactId>
                 </artifactItem>
+                <artifactItem>
+                  <groupId>org.daisy.pipeline.modules.braille</groupId>
+                  <artifactId>mod-mtm</artifactId>
+                </artifactItem>
                 <artifactItem>
                   <groupId>org.daisy.pipeline.modules.braille</groupId>
                   <artifactId>common-utils</artifactId>
@@ -1098,20 +1112,95 @@
   </build>
 
   <profiles>
+    <profile>
+      <id>mac</id>
+      <activation>
+        <os>
+          <family>mac</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-cli-mac</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.daisy.pipeline</groupId>
+                      <artifactId>cli</artifactId>
+                      <type>zip</type>
+                      <classifier>darwin_386</classifier>
+                      <outputDirectory>${project.build.directory}/cli/mac32</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>dist-mac</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/dist-mac.xml</descriptor>
+                  </descriptors>
+                  <filters>
+                    <filter>src/main/assembly/dist.properties</filter>
+                    <filter>src/main/assembly/dist-nix.properties</filter>
+                  </filters>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>pipeline2-${project.version}_mac</finalName>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>          
+        </plugins>
+      </build>
+    </profile>
 
-    <!-- REDHAT/CentOS RPM packet server engine -->
     <profile>
-      <id>rpm</id>
-      <properties>
-        <pipeline.user>root</pipeline.user>
-        <pipeline.group>root</pipeline.group>
-        <pipeline.home>/opt/daisy-pipeline2</pipeline.home>
-        <bundles.auto.deploy>system/felix</bundles.auto.deploy> <!-- don't change! must be the same as in dist.properties -->
-        <bundles.bootstrap>system/bootstrap</bundles.bootstrap> <!-- don't change! must be the same as in dist.properties -->
-        <bundles.modules>modules</bundles.modules> <!-- don't change! must be the same as in dist.properties -->
-      </properties>
+      <id>linux</id>
+      <activation>
+        <os>
+          <name>linux</name>
+        </os>
+      </activation>
       <build>
         <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-cli-linux</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.daisy.pipeline</groupId>
+                      <artifactId>cli</artifactId>
+                      <type>zip</type>
+                      <classifier>linux_386</classifier>
+                      <outputDirectory>${project.build.directory}/cli/linux32</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
           <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <executions>
@@ -1134,601 +1223,69 @@
                 </configuration>
               </execution>
             </executions>
+          </plugin>          
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>win</id>
+      <activation>
+        <os>
+          <family>windows</family>
+        </os>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>unpack-cli-win</id>
+                <goals>
+                  <goal>unpack</goal>
+                </goals>
+                <configuration>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.daisy.pipeline</groupId>
+                      <artifactId>cli</artifactId>
+                      <version>2.0.0</version>
+                      <type>zip</type>
+                      <classifier>windows_386</classifier>
+                      <outputDirectory>${project.build.directory}/cli/win32</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
+                </configuration>
+              </execution>
+            </executions>
           </plugin>
           <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>rpm-maven-plugin</artifactId>
-            <version>2.0.1</version>
+            <artifactId>maven-assembly-plugin</artifactId>
             <executions>
               <execution>
-                <id>generate-rpm</id>
+                <id>dist-win</id>
+                <phase>package</phase>
                 <goals>
-                  <goal>rpm</goal>
+                  <goal>single</goal>
                 </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <name>pipeline2</name>
-              <group>daisy-pipeline2</group>
-              <description>daisy-pipeline2</description>
-              <needarch>x86_64</needarch>
-              <mappings>
-                <mapping>
-                  <directory>${pipeline.home}</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>src/main/resources</location>
-                      <includes>
-                        <include>etc/**</include>
-                        <include>NOTICE.txt</include>
-                        <include>README.txt</include>
-                      </includes>
-                      <excludes>
-                        <exclude>etc/system.properties</exclude>
-                        <exclude>etc/config.properties</exclude>
-                        <exclude>etc/org.apache.felix.fileinstall-modules.cfg</exclude>
-                        <exclude>etc/org.apache.felix.fileinstall-libs.cfg</exclude>
-                      </excludes>
-                    </source>
-                    <source>
-                      <location>src/main/resources</location>
-                      <includes>
-                        <include>samples/daisy202/**</include>
-                        <include>samples/daisy3/**</include>
-                        <include>samples/dtbook/**</include>
-                        <include>samples/zedai/**</include>
-                      </includes>
-                      <excludes>
-                        <exclude>samples/html/**</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}</directory>
-                  <filemode>0640</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>src/main/resources</location>
-                      <includes>
-                        <include>etc/system.properties</include>
-                        <include>etc/config.properties</include>
-                        <include>etc/org.apache.felix.fileinstall-modules.cfg</include>
-                      </includes>
-                      <filter>true</filter>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}</directory>
-                  <filemode>0550</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>src/main/resources</location>
-                      <includes>
-                        <include>bin/**</include>
-                      </includes>
-                      <excludes>
-                        <exclude>bin/pipeline2.bat</exclude>
-                      </excludes>
-                      <filter>true</filter>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/${bundles.bootstrap}</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/bootstrap</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/${bundles.auto.deploy}</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/felix</location>
-                      <excludes>
-                        <exclude>org.apache.felix.org.apache.felix.gogo*</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/${bundles.auto.deploy}/gogo</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/felix</location>
-                      <includes>
-                        <include>org.apache.felix.org.apache.felix.gogo*</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/system/framework</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/libs</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/system/framework</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/pipeline</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/system/frontend</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/frontend</location>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.home}/${bundles.modules}</directory>
-                  <filemode>0644</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/bundles/modules</location>
-                      <excludes>
-                        <exclude>linux</exclude>
-                        <exclude>linux/*</exclude>
-                        <exclude>win</exclude>
-                        <exclude>win/*</exclude>
-                        <exclude>mac</exclude>
-                        <exclude>mac/*</exclude>
-                      </excludes>
-                    </source>
-                    <source>
-                      <location>${project.basedir}/target/bundles/modules/linux</location>
-                    </source>
-                  </sources>
-                </mapping>
-              </mappings>
-              <filters>
-                <filter>src/main/assembly/dist.properties</filter>
-                <filter>src/main/assembly/dist-nix.properties</filter>
-              </filters>
-              <postremoveScriptlet>
-                <script>
-rm -rf /opt/daisy-pipeline2
-                </script>
-              </postremoveScriptlet>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- REDHAT/CentOS RPM packet cli -->
-    <profile>
-      <id>rpm-cli</id>
-      <properties>
-        <pipeline.user>root</pipeline.user>
-        <pipeline.group>root</pipeline.group>
-        <pipeline.home>/opt/daisy-pipeline2</pipeline.home>
-        <pipeline.cli.home>${pipeline.home}/cli</pipeline.cli.home>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-cli-linux</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>cli</artifactId>
-                      <type>zip</type>
-                      <classifier>linux_386</classifier>
-                      <outputDirectory>${project.build.directory}/cli/linux32</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>rpm-maven-plugin</artifactId>
-            <version>2.0.1</version>
-            <executions>
-              <execution>
-                <id>generate-rpm</id>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <name>pipeline2-cli</name>
-              <group>daisy-pipeline2-cli</group>
-              <description>daisy-pipeline2-cli</description>
-              <needarch>x86_64</needarch>
-              <mappings>
-                <mapping>
-                  <directory>${pipeline.cli.home}</directory>
-                  <filemode>0640</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>src/main/resources/cli</location>
-                      <includes>
-                        <include>config.yml</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.cli.home}</directory>
-                  <filemode>0640</filemode>
-                  <username>${pipeline.user}</username>
-                  <groupname>${pipeline.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/cli/linux32</location>
-                      <includes>
-                        <include>dp2</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-              </mappings>
-              <postremoveScriptlet>
-                <script>
-rm -rf /opt/daisy-pipeline2/cli
-                </script>
-              </postremoveScriptlet>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-    
-    <!-- REDHAT/CentOS RPM packet Web UI -->
-    <profile>
-      <id>rpm-webui</id>
-      <properties>
-        <pipeline.webui-version>1.8.1</pipeline.webui-version>
-        <pipeline.webui.user>root</pipeline.webui.user>
-        <pipeline.webui.group>root</pipeline.webui.group>
-        <pipeline.webui.home>/opt/daisy-pipeline2-webui</pipeline.webui.home>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>webui</artifactId>
-                      <version>1.8.1</version>
-                      <type>zip</type>
-                      <overWrite>true</overWrite>
-                      <outputDirectory>target/webui</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                  <overWriteReleases>false</overWriteReleases>
-                  <overWriteSnapshots>true</overWriteSnapshots>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>rpm-maven-plugin</artifactId>
-            <version>2.0.1</version>
-            <executions>
-              <execution>
-                <id>generate-rpm-webui</id>
-                <goals>
-                  <goal>rpm</goal>
-                </goals>
-              </execution>
-            </executions>
-            <configuration>
-              <name>pipeline2-webui</name>
-              <group>daisy-pipeline2-webui</group>
-              <description>daisy-pipeline2-webui</description>
-              <version>${pipeline.webui-version}</version> 
-              <needarch>noarch</needarch>
-              <mappings>
-                <mapping>
-                  <directory>${pipeline.webui.home}</directory>
-                  <filemode>660</filemode>
-                  <username>${pipeline.webui.user}</username>
-                  <groupname>${pipeline.webui.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/webui/daisy-pipeline-webui</location>
-                      <includes>
-                        <include>dp2webui/**</include>
-                        <include>lib/**</include>
-                        <include>startui/**</include>
-                        <include>themes/**</include>
-                      </includes>
-                      <excludes>
-                        <exclude>application.conf</exclude>
-                        <exclude>logger.xml</exclude>
-                        <exclude>uninstall</exclude>
-                        <exclude>uninstall.bat</exclude>
-                        <exclude>start</exclude>
-                        <exclude>start.bat</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.webui.home}</directory>
-                  <filemode>660</filemode>
-                  <username>${pipeline.webui.user}</username>
-                  <groupname>${pipeline.webui.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/webui/daisy-pipeline-webui</location>
-                      <includes>
-                        <include>application.conf</include>
-                        <include>logger.xml</include>
-                      </includes>
-                      <excludes>
-                        <exclude>dp2webui/**</exclude>
-                        <exclude>lib/**</exclude>
-                        <exclude>startui/**</exclude>
-                        <exclude>themes/**</exclude>
-                        <exclude>uninstall</exclude>
-                        <exclude>uninstall.bat</exclude>
-                        <exclude>start</exclude>
-                        <exclude>start.bat</exclude>
-                      </excludes>
-                    </source>
-                  </sources>
-                </mapping>
-                <mapping>
-                  <directory>${pipeline.webui.home}</directory>
-                  <filemode>550</filemode>
-                  <username>${pipeline.webui.user}</username>
-                  <groupname>${pipeline.webui.group}</groupname>
-                  <sources>
-                    <source>
-                      <location>${project.basedir}/target/webui/daisy-pipeline-webui</location>
-                      <includes>
-                        <include>start</include>
-                      </includes>
-                    </source>
-                  </sources>
-                </mapping>
-              </mappings>
-              <preremoveScriptlet>
-                <script>
-rm -rf /opt/daisy-pipeline2-webui
-                </script>
-              </preremoveScriptlet>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
- 
-    <profile>
-      <id>mac</id>
-      <activation>
-        <os>
-          <family>mac</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-cli-mac</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>cli</artifactId>
-                      <type>zip</type>
-                      <classifier>darwin_386</classifier>
-                      <outputDirectory>${project.build.directory}/cli/mac32</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>dist-mac</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/assembly/dist-mac.xml</descriptor>
-                  </descriptors>
-                  <filters>
-                    <filter>src/main/assembly/dist.properties</filter>
-                    <filter>src/main/assembly/dist-nix.properties</filter>
-                  </filters>
-                  <appendAssemblyId>false</appendAssemblyId>
-                  <finalName>pipeline2-${project.version}_mac</finalName>
-                </configuration>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/dist-win.xml</descriptor>
+                  </descriptors>
+                  <filters>
+                    <filter>src/main/assembly/dist.properties</filter>
+                    <filter>src/main/assembly/dist-win.properties</filter>
+                  </filters>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>pipeline2-${project.version}_win</finalName>
+                </configuration>
               </execution>
             </executions>
           </plugin>          
         </plugins>
       </build>
     </profile>
-    <profile>
-      <id>linux</id>
-      <activation>
-        <os>
-          <name>linux</name>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-cli-linux</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>cli</artifactId>
-                      <type>zip</type>
-                      <classifier>linux_386</classifier>
-                      <outputDirectory>${project.build.directory}/cli/linux32</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>dist-linux</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/assembly/dist-linux.xml</descriptor>
-                  </descriptors>
-                  <filters>
-                    <filter>src/main/assembly/dist.properties</filter>
-                    <filter>src/main/assembly/dist-nix.properties</filter>
-                  </filters>
-                  <appendAssemblyId>false</appendAssemblyId>
-                  <finalName>pipeline2-${project.version}_linux</finalName>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>          
-        </plugins>
-      </build>
-    </profile>
-    <profile>
-      <id>win</id>
-      <activation>
-        <os>
-          <family>windows</family>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>unpack-cli-win</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>cli</artifactId>
-                      <version>2.0.0</version>
-                      <type>zip</type>
-                      <classifier>windows_386</classifier>
-                      <outputDirectory>${project.build.directory}/cli/win32</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>dist-win</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>single</goal>
-                </goals>
-                <configuration>
-                  <descriptors>
-                    <descriptor>src/main/assembly/dist-win.xml</descriptor>
-                  </descriptors>
-                  <filters>
-                    <filter>src/main/assembly/dist.properties</filter>
-                    <filter>src/main/assembly/dist-win.properties</filter>
-                  </filters>
-                  <appendAssemblyId>false</appendAssemblyId>
-                  <finalName>pipeline2-${project.version}_win</finalName>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>          
-        </plugins>
-      </build>
-    </profile>
-
-
 
     <profile>
       <id>dev-launcher</id>
@@ -1808,12 +1365,99 @@ rm -rf /opt/daisy-pipeline2-webui
                     </java>
                     <java classname="net.sf.saxon.Transform">
                       <arg value="target/tmp/effective-pom.xml" />
-                      <arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
-                      <arg value="id=copy-frontend" />
-                      <arg value="startLevel=100" />
-                      <arg value="dest=${project.baseUri}/target/generated-resources/etc" />
-                      <arg value="prefix=frontend" />
-                      <arg value="home=${user.home}" />
+                      <arg value="src/main/xslt/pom-to-fileinstall-config.xsl" />
+                      <arg value="id=copy-frontend" />
+                      <arg value="startLevel=100" />
+                      <arg value="dest=${project.baseUri}/target/generated-resources/etc" />
+                      <arg value="prefix=frontend" />
+                      <arg value="home=${user.home}" />
+                    </java>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>net.sf.saxon</groupId>
+                <artifactId>Saxon-HE</artifactId>
+                <version>9.5.1-5</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>dist-mac</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dist-linux</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dist-win</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dev-launcher-assembly</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <descriptors>
+                    <descriptor>src/main/assembly/dev.xml</descriptor>
+                  </descriptors>
+                  <filters>
+                    <filter>src/main/assembly/dev.properties</filter>
+                  </filters>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>dev-launcher</finalName>
+                  <attach>false</attach>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>releaseDescriptor</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-help-plugin</artifactId>
+            <version>2.1.1</version>
+            <executions>
+              <execution>
+                <id>generate-effective-pom</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>effective-pom</goal>
+                </goals>
+                <configuration>
+                  <output>target/tmp/effective-pom.xml</output>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>generate-release-descriptor</id>
+                <phase>generate-resources</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <target>
+                    <java classname="net.sf.saxon.Transform">
+                      <arg value="target/tmp/effective-pom.xml" />
+                      <arg value="src/main/xslt/pom-to-release.xslt" />
+                      <arg line="-o:./target/release-descriptor/releaseDescriptor.xml" />
                     </java>
                   </target>
                 </configuration>
@@ -1866,8 +1510,6 @@ rm -rf /opt/daisy-pipeline2-webui
       </build>
     </profile>
 
-
-
     <profile>
       <id>deb</id>
       <properties>
@@ -1878,9 +1520,6 @@ rm -rf /opt/daisy-pipeline2-webui
         <pipeline.config>/etc/opt/daisy-pipeline2</pipeline.config>
         <pipeline.cli.home>/opt/daisy-pipeline2-cli</pipeline.cli.home>
         <pipeline.cli.config>/etc/opt/daisy-pipeline2-cli</pipeline.cli.config>
-        <pipeline.webui.user>pipeline2-webui</pipeline.webui.user>
-        <pipeline.webui.home>/opt/daisy-pipeline2-webui</pipeline.webui.home>
-        <pipeline.webui.data>/var/opt/daisy-pipeline2-webui</pipeline.webui.data>
         <bundles.auto.deploy>system/felix</bundles.auto.deploy>
         <bundles.bootstrap>system/bootstrap</bundles.bootstrap>
         <bundles.modules>modules</bundles.modules>
@@ -1895,29 +1534,13 @@ rm -rf /opt/daisy-pipeline2-webui
         <pipeline.ws.clientsecret>supersecret</pipeline.ws.clientsecret>
         <pipeline.cli.exec_line>/dev/null</pipeline.cli.exec_line>
         <pipeline.cli.starting>false</pipeline.cli.starting>
+        <pipeline.log.jobappender>org.daisy.pipeline.logging.IgnoreSiftAppender</pipeline.log.jobappender>
       </properties>
       <build>
         <plugins>
           <plugin>
             <artifactId>maven-dependency-plugin</artifactId>
             <executions>
-              <execution>
-                <id>copy-pipeline-webui</id>
-                <goals>
-                  <goal>unpack</goal>
-                </goals>
-                <configuration>
-                  <artifactItems>
-                    <artifactItem>
-                      <groupId>org.daisy.pipeline</groupId>
-                      <artifactId>webui</artifactId>
-                      <version>1.8.1</version>
-                      <type>zip</type>
-                      <outputDirectory>${project.build.directory}/webui</outputDirectory>
-                    </artifactItem>
-                  </artifactItems>
-                </configuration>
-              </execution>
               <execution>
                 <id>unpack-cli-linux</id>
                 <goals>
@@ -1958,6 +1581,7 @@ rm -rf /opt/daisy-pipeline2-webui
                         <include>etc/config.properties</include>
                         <include>etc/org.apache.felix.fileinstall-modules.cfg</include>
                         <include>etc/system.properties</include>
+                        <include>etc/config-logback.xml</include>
                       </includes>
                     </resource>
                     <resource>
@@ -1995,7 +1619,6 @@ rm -rf /opt/daisy-pipeline2-webui
                   <classifier>all</classifier>
                   <deb>target/daisy-pipeline2_${project.version}_all.deb</deb>
                   <dataSet>
-
                     <!-- ======== -->
                     <!-- binaries -->
                     <!-- ======== -->
@@ -2016,7 +1639,6 @@ rm -rf /opt/daisy-pipeline2-webui
                       <src>target/filtered-resources/deb${pipeline.home}/bin/debian.cfg</src>
                       <dst>${pipeline.home}/bin/debian.cfg</dst>
                     </data>
-
                     <!-- ====== -->
                     <!-- daemon -->
                     <!-- ====== -->
@@ -2029,7 +1651,6 @@ rm -rf /opt/daisy-pipeline2-webui
                         <filemode>755</filemode>
                       </mapper>
                     </data>
-
                     <!-- =================== -->
                     <!-- configuration files -->
                     <!-- =================== -->
@@ -2063,7 +1684,7 @@ rm -rf /opt/daisy-pipeline2-webui
                     </data>
                     <data>
                       <type>file</type>
-                      <src>src/main/resources/etc/config-logback.xml</src>
+                      <src>target/filtered-resources/resources/etc/config-logback.xml</src>
                       <dst>${pipeline.config}/config-logback.xml</dst>
                     </data>
                     <data>
@@ -2077,7 +1698,6 @@ rm -rf /opt/daisy-pipeline2-webui
                       <src>src/main/deb/etc/default/pipeline2d</src>
                       <dst>/etc/default/pipeline2d</dst>
                     </data>
-
                     <!-- ============== -->
                     <!-- system bundles -->
                     <!-- ============== -->
@@ -2135,7 +1755,6 @@ rm -rf /opt/daisy-pipeline2-webui
                         <type>perm</type>
                       </mapper>
                     </data>
-
                     <!-- ======= -->
                     <!-- modules -->
                     <!-- ======= -->
@@ -2160,7 +1779,6 @@ rm -rf /opt/daisy-pipeline2-webui
                         <type>perm</type>
                       </mapper>
                     </data>
-
                     <!-- ========= -->
                     <!-- log files -->
                     <!-- ========= -->
@@ -2170,7 +1788,6 @@ rm -rf /opt/daisy-pipeline2-webui
                         <path>${pipeline.log}</path>
                       </paths>
                     </data>
-
                   </dataSet>
                 </configuration>
               </execution>
@@ -2186,7 +1803,6 @@ rm -rf /opt/daisy-pipeline2-webui
                   <classifier>cli_all</classifier>
                   <deb>target/daisy-pipeline2-cli_${project.version}_all.deb</deb>
                   <dataSet>
-                    
                     <!-- ============ -->
                     <!-- cli binaries -->
                     <!-- ============ -->
@@ -2194,122 +1810,389 @@ rm -rf /opt/daisy-pipeline2-webui
                       <type>directory</type>
                       <src>target/cli/linux32</src>
                       <includes>
-                        dp2
+                        dp2
+                      </includes>
+                      <mapper>
+                        <type>perm</type>
+                        <prefix>${pipeline.cli.home}</prefix>
+                        <filemode>755</filemode>
+                      </mapper>
+                    </data>
+                    <!-- ======================= -->
+                    <!-- cli configuration files -->
+                    <!-- ======================= -->
+                    <data>
+                      <type>file</type>
+                      <src>target/filtered-resources/cli/config.yml</src>
+                      <dst>${pipeline.cli.home}/config.yml</dst>
+                    </data>
+                    <data>
+                      <type>link</type>
+                      <symlink>true</symlink>
+                      <linkName>${pipeline.cli.config}/config.yml</linkName>
+                      <linkTarget>${pipeline.cli.home}/config.yml</linkTarget>
+                    </data>
+                  </dataSet>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>dist-mac</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dist-linux</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dist-win</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- REDHAT/CentOS RPM packet server engine -->
+    <profile>
+      <id>rpm</id>
+      <properties>
+        <pipeline.user>root</pipeline.user>
+        <pipeline.group>root</pipeline.group>
+        <pipeline.home>/opt/daisy-pipeline2</pipeline.home>
+        <bundles.auto.deploy>system/felix</bundles.auto.deploy> <!-- don't change! must be the same as in dist.properties -->
+        <bundles.bootstrap>system/bootstrap</bundles.bootstrap> <!-- don't change! must be the same as in dist.properties -->
+        <bundles.modules>modules</bundles.modules> <!-- don't change! must be the same as in dist.properties -->
+        <pipeline.log.jobappender>org.daisy.pipeline.logging.IgnoreSiftAppender</pipeline.log.jobappender>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-assembly-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>dist-linux</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>single</goal>
+                </goals>
+                <configuration>
+                  <!-- <formats>dir</formats> -->
+                  <descriptors>
+                    <descriptor>src/main/assembly/dist-linux.xml</descriptor>
+                  </descriptors>
+                  <filters>
+                    <filter>src/main/assembly/dist.properties</filter>
+                    <filter>src/main/assembly/dist-nix.properties</filter>
+                  </filters>
+                  <appendAssemblyId>false</appendAssemblyId>
+                  <finalName>pipeline2-${project.version}_linux</finalName>
+                </configuration>
+              </execution>
+              <execution>
+                <id>dist-mac</id>
+                <phase>none</phase>
+              </execution>
+              <execution>
+                <id>dist-win</id>
+                <phase>none</phase>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rpm-maven-plugin</artifactId>
+            <version>2.0.1</version>
+            <executions>
+              <execution>
+                <id>generate-rpm</id>
+                <goals>
+                  <goal>attached-rpm</goal>
+                </goals>
+              </execution>
+            </executions>
+            <configuration>
+              <name>pipeline2</name>
+              <group>daisy-pipeline2</group>
+              <description>daisy-pipeline2</description>
+              <needarch>x86_64</needarch>
+              <mappings>
+                <mapping>
+                  <directory>${pipeline.home}</directory>
+                  <filemode>0644</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>src/main/resources</location>
+                      <includes>
+                        <include>etc/**</include>
+                        <include>NOTICE.txt</include>
+                        <include>README.txt</include>
+                      </includes>
+                      <excludes>
+                        <exclude>etc/system.properties</exclude>
+                        <exclude>etc/config.properties</exclude>
+                        <exclude>etc/org.apache.felix.fileinstall-modules.cfg</exclude>
+                        <exclude>etc/org.apache.felix.fileinstall-libs.cfg</exclude>
+                      </excludes>
+                    </source>
+                    <source>
+                      <location>src/main/resources</location>
+                      <includes>
+                        <include>samples/daisy202/**</include>
+                        <include>samples/daisy3/**</include>
+                        <include>samples/dtbook/**</include>
+                        <include>samples/zedai/**</include>
+                      </includes>
+                      <excludes>
+                        <exclude>samples/html/**</exclude>
+                      </excludes>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}</directory>
+                  <filemode>0640</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>src/main/resources</location>
+                      <includes>
+                        <include>etc/system.properties</include>
+                        <include>etc/config.properties</include>
+                        <include>etc/org.apache.felix.fileinstall-modules.cfg</include>
+						<include>etc/config-logback.xml</include>
+                      </includes>
+                      <filter>true</filter>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}</directory>
+                  <filemode>0550</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>src/main/resources</location>
+                      <includes>
+                        <include>bin/**</include>
+                      </includes>
+                      <excludes>
+                        <exclude>bin/pipeline2.bat</exclude>
+                      </excludes>
+                      <filter>true</filter>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/${bundles.bootstrap}</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/bootstrap</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/${bundles.auto.deploy}</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/felix</location>
+                      <excludes>
+                        <exclude>org.apache.felix.org.apache.felix.gogo*</exclude>
+                      </excludes>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/${bundles.auto.deploy}/gogo</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/felix</location>
+                      <includes>
+                        <include>org.apache.felix.org.apache.felix.gogo*</include>
                       </includes>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>${pipeline.cli.home}</prefix>
-                        <filemode>755</filemode>
-                      </mapper>
-                    </data>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/system/framework</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/libs</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/system/framework</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/pipeline</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/system/frontend</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/frontend</location>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.home}/${bundles.modules}</directory>
+                  <filemode>0755</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/bundles/modules</location>
+                      <excludes>
+                        <exclude>linux</exclude>
+                        <exclude>linux/*</exclude>
+                        <exclude>win</exclude>
+                        <exclude>win/*</exclude>
+                        <exclude>mac</exclude>
+                        <exclude>mac/*</exclude>
+                      </excludes>
+                    </source>
+                    <source>
+                      <location>${project.basedir}/target/bundles/modules/linux</location>
+                    </source>
+                  </sources>
+                </mapping>
+              </mappings>
+              <filters>
+                <filter>src/main/assembly/dist.properties</filter>
+                <filter>src/main/assembly/dist-nix.properties</filter>
+              </filters>
+              <postremoveScriptlet>
+                <script>
+rm -rf /opt/daisy-pipeline2
+                </script>
+              </postremoveScriptlet>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
 
-                    <!-- ======================= -->
-                    <!-- cli configuration files -->
-                    <!-- ======================= -->
-                    <data>
-                      <type>file</type>
-                      <src>target/filtered-resources/cli/config.yml</src>
-                      <dst>${pipeline.cli.home}/config.yml</dst>
-                    </data>
-                    <data>
-                      <type>link</type>
-                      <symlink>true</symlink>
-                      <linkName>${pipeline.cli.config}/config.yml</linkName>
-                      <linkTarget>${pipeline.cli.home}/config.yml</linkTarget>
-                    </data>
-                  </dataSet>
-                </configuration>
-              </execution>
+    <!-- REDHAT/CentOS RPM packet cli -->
+    <profile>
+      <id>rpm-cli</id>
+      <properties>
+        <pipeline.user>root</pipeline.user>
+        <pipeline.group>root</pipeline.group>
+        <pipeline.home>/opt/daisy-pipeline2</pipeline.home>
+        <pipeline.cli.home>${pipeline.home}/cli</pipeline.cli.home>
+      </properties>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <executions>
               <execution>
-                <id>package-deb-webui</id>
-                <phase>none</phase>
+                <id>unpack-cli-linux</id>
                 <goals>
-                  <goal>jdeb</goal>
+                  <goal>unpack</goal>
                 </goals>
                 <configuration>
-                  <controlDir>target/filtered-resources/deb/DEBIAN.webui</controlDir>
-                  <timestamped>true</timestamped>
-                  <classifier>webui_all</classifier>
-                  <deb>target/daisy-pipeline2-webui_${project.version}_all.deb</deb>
-                  <dataSet>
-
-                    <!-- ===== -->
-                    <!-- webui -->
-                    <!-- ===== -->
-                    <data>
-                      <type>directory</type>
-                      <src>target/webui/daisy-pipeline-webui</src>
-                      <excludes>
-                        start,
-                        start.bat,
-                        uninstall,
-                        uninstall.bat,
-                        dp2webui/*
-                      </excludes>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>${pipeline.webui.home}</prefix>
-                      </mapper>
-                    </data>
-                    <data>
-                      <src>target/filtered-resources/deb${pipeline.webui.home}/start</src>
-                      <type>file</type>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>${pipeline.webui.home}</prefix>
-                        <filemode>755</filemode>
-                      </mapper>
-                    </data>
-
-                    <!-- ========== -->
-                    <!-- webui data -->
-                    <!-- ========== -->
-                    <data>
-                      <type>directory</type>
-                      <src>target/webui/daisy-pipeline-webui/dp2webui</src>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>${pipeline.webui.data}/webui/dp2webui</prefix>
-                      </mapper>
-                    </data>
-
-                    <!-- ============ -->
-                    <!-- webui daemon -->
-                    <!-- ============ -->
-                    <data>
-                      <src>target/filtered-resources/deb/etc/init.d/pipeline2-webuid</src>
-                      <type>file</type>
-                      <mapper>
-                        <type>perm</type>
-                        <prefix>/etc/init.d</prefix>
-                        <filemode>755</filemode>
-                      </mapper>
-                    </data>
-                  </dataSet>
+                  <artifactItems>
+                    <artifactItem>
+                      <groupId>org.daisy.pipeline</groupId>
+                      <artifactId>cli</artifactId>
+                      <type>zip</type>
+                      <classifier>linux_386</classifier>
+                      <outputDirectory>${project.build.directory}/cli/linux32</outputDirectory>
+                    </artifactItem>
+                  </artifactItems>
                 </configuration>
               </execution>
             </executions>
           </plugin>
           <plugin>
-            <artifactId>maven-assembly-plugin</artifactId>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rpm-maven-plugin</artifactId>
+            <version>2.0.1</version>
             <executions>
               <execution>
-                <id>dist-mac</id>
-                <phase>none</phase>
-              </execution>
-              <execution>
-                <id>dist-linux</id>
-                <phase>none</phase>
-              </execution>
-              <execution>
-                <id>dist-win</id>
-                <phase>none</phase>
+                <id>generate-rpm</id>
+                <goals>
+                  <goal>rpm</goal>
+                </goals>
               </execution>
             </executions>
+            <configuration>
+              <name>pipeline2-cli</name>
+              <group>daisy-pipeline2-cli</group>
+              <description>daisy-pipeline2-cli</description>
+              <needarch>x86_64</needarch>
+              <mappings>
+                <mapping>
+                  <directory>${pipeline.cli.home}</directory>
+                  <filemode>0640</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>src/main/resources/cli</location>
+                      <includes>
+                        <include>config.yml</include>
+                      </includes>
+                    </source>
+                  </sources>
+                </mapping>
+                <mapping>
+                  <directory>${pipeline.cli.home}</directory>
+                  <filemode>0640</filemode>
+                  <username>${pipeline.user}</username>
+                  <groupname>${pipeline.group}</groupname>
+                  <sources>
+                    <source>
+                      <location>${project.basedir}/target/cli/linux32</location>
+                      <includes>
+                        <include>dp2</include>
+                      </includes>
+                    </source>
+                  </sources>
+                </mapping>
+              </mappings>
+              <postremoveScriptlet>
+                <script>
+rm -rf /opt/daisy-pipeline2/cli
+                </script>
+              </postremoveScriptlet>
+            </configuration>
           </plugin>
         </plugins>
       </build>
     </profile>
+
     <profile>
       <id>webui</id>
       <build>
@@ -2402,6 +2285,32 @@ rm -rf /opt/daisy-pipeline2-webui
         </plugins>
       </build>
     </profile>
+    <profile>
+      <id>releaseDesciptor</id>
+      <properties>
+      </properties>
+      <build>
+        <plugins>
+          <!-- copy nsis file for windows installer generation -->
+          <plugin>
+            <artifactId>maven-help-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>copy-resources</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>effective-pom</goal>
+                </goals>
+                <!--<configuration>-->
+                  <!--<output>${basedir}/target/effective-pom.xml</output>-->
+                <!--</configuration>-->
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!-- NSIS Profile for installer generation invoke with -P installer -->
     <profile>
       <id>installer</id>
@@ -2499,5 +2408,11 @@ rm -rf /opt/daisy-pipeline2-webui
       <name>SpringSource Enterprise Bundle Repository - External Bundle Releases</name>
       <url>http://repository.springsource.com/maven/bundles/external</url>
     </repository>
+    <!-- staging address for mod-mtm modules -->
+    <repository>
+		<id>sonatype-nexus-staging-not-released</id>
+        <name>Nexus Release Repository</name>
+        <url>http://oss.sonatype.org/content/groups/staging/</url>
+      </repository>
   </repositories>
-</project>
+</project>
\ No newline at end of file