diff --git a/extras/rya.streams/query-manager/pom.xml b/extras/rya.streams/query-manager/pom.xml
index d2ccbf5..afb0386 100644
--- a/extras/rya.streams/query-manager/pom.xml
+++ b/extras/rya.streams/query-manager/pom.xml
@@ -174,76 +174,116 @@
             </plugin>
 
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>rpm-maven-plugin</artifactId>
+                <groupId>de.dentrassi.maven</groupId>
+                <artifactId>rpm</artifactId>
+                <version>0.10.0</version>
                 <executions>
                     <execution>
-                        <id>set-rpm-properties</id>
-                        <goals>
-                            <goal>version</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>create-rpm-distribution</id>
-                        <goals>
-                            <goal>attached-rpm</goal>
-                        </goals>
+                        <id>create-rpm-properties</id>
                         <phase>package</phase>
+                        <goals>
+                            <goal>rpm</goal>
+                        </goals>
                         <configuration>
-                            <group>${project.groupId}</group>
-                            <name>${project.artifactId}</name>
-                            <classifier>noarch</classifier>
-                            <defaultUsername>root</defaultUsername>
-                            <defaultGroupname>root</defaultGroupname>
-                            <defaultDirmode>755</defaultDirmode>
-                            <defaultFilemode>644</defaultFilemode>
-                            
+                            <attach>false</attach> <!-- don't attach RPM -->
+                            <group>${project.groupId}/${project.artifactId}</group> <!-- set RPM group -->
+                            <architecture>noarch</architecture>
+
+                            <signature>
+                                <skip>true</skip>
+                            </signature>
+
                             <!-- (Un)Install scripts that enable/disable the daemon.-->
-                            <postinstallScriptlet>
-                                <scriptFile>${rpm.staging.path}/bin/rpm/postinstall.sh</scriptFile>
-                                <fileEncoding>utf-8</fileEncoding>
-                            </postinstallScriptlet>
-                            <preremoveScriptlet>
-                                <scriptFile>${rpm.staging.path}/bin/rpm/preremove.sh</scriptFile>
-                                <fileEncoding>utf-8</fileEncoding>
-                            </preremoveScriptlet>
-                            
-                            <!-- This project requires the Apache Commons Daemon applications. -->
+                            <afterInstallation>
+                                <file>${rpm.staging.path}/bin/rpm/postinstall.sh</file>
+                            </afterInstallation>
+                            <beforeRemoval>
+                                <file>${rpm.staging.path}/bin/rpm/preremove.sh</file>
+                            </beforeRemoval>
+
+                             <!-- This project requires the Apache Commons Daemon applications. -->
                             <requires>
                                 <require>jsvc</require>
                             </requires>
-                            
-                            <mappings>
-                                <!-- Copy everything over to the /opt directory, except for the scripts. -->
-                                <mapping>
-                                    <directory>/opt/rya-streams-query-manager-${rpm.version}</directory>
-                                    <sources>
-                                        <!-- Copy over everything exception for the executable script. -->
-                                        <source>
-                                            <location>${rpm.staging.path}</location>
-                                            <excludes>
-                                                <exclude>bin/rpm/**</exclude>
-                                                <exclude>bin/rya-streams-query-manager.sh</exclude>
-                                            </excludes>
-                                        </source>
-                                    </sources>
-                                </mapping>
 
-                                <!-- Copy over the scripts with the correct execution permissions. -->
-                                <mapping>
-                                    <directory>/opt/rya-streams-query-manager-${rpm.version}/bin</directory>
-                                    <directoryIncluded>false</directoryIncluded>
-                                    <filemode>554</filemode>
-                                    <sources>
-                                        <source>
-                                            <location>${rpm.staging.path}/bin</location>
-                                            <includes>
-                                                <include>rya-streams-query-manager.sh</include>
-                                            </includes>
-                                        </source>
-                                    </sources>
-                                </mapping>
-                            </mappings>
+                            <rulesets>
+                                <ruleset>
+                                    <id>default-ruleset</id>
+                                    <rules>
+                                        <rule>
+                                            <when>
+                                                <type>directory</type>
+                                            </when>
+                                            <mode>0755</mode>
+                                        </rule>
+                                        <rule>
+                                            <when>
+                                                <type>file</type>
+                                            </when>
+                                            <mode>0644</mode>
+                                        </rule>
+                                        <file>
+                                            <when>
+                                                <suffix>configuration.xml</suffix>
+                                            </when>
+                                            <configuration>true</configuration>
+                                        </file>
+                                        <file>
+                                            <when>
+                                                <suffix>log4j.xml</suffix>
+                                            </when>
+                                            <configuration>true</configuration>
+                                        </file>
+                                        <file>
+                                            <when>
+                                                <suffix>README.txt</suffix>
+                                            </when>
+                                            <readme>true</readme>
+                                        </file>
+                                    </rules>
+                                </ruleset>
+                            </rulesets>
+                            <entries>
+                                <!-- Copy everything over to the /opt directory, except for the scripts. -->
+                                <entry>
+                                    <name>/opt/rya-streams-query-manager-${project.version}/bin/systemd</name>
+                                    <collect>
+                                        <from>${rpm.staging.path}/bin/systemd</from>
+                                        <directories>true</directories>
+                                    </collect>
+                                    <ruleset>default-ruleset</ruleset>
+                                </entry>
+                                <entry>
+                                    <name>/opt/rya-streams-query-manager-${project.version}/config</name>
+                                    <collect>
+                                        <from>${rpm.staging.path}/config</from>
+                                        <directories>true</directories>
+                                    </collect>
+                                    <ruleset>default-ruleset</ruleset>
+                                </entry>
+                                <entry>
+                                    <name>/opt/rya-streams-query-manager-${project.version}/lib</name>
+                                    <collect>
+                                        <from>${rpm.staging.path}/lib</from>
+                                        <directories>true</directories>
+                                    </collect>
+                                    <ruleset>default-ruleset</ruleset>
+                                </entry>
+                                <entry>
+                                    <name>/opt/rya-streams-query-manager-${project.version}/README.txt</name>
+                                    <collect>
+                                        <from>${rpm.staging.path}/README.txt</from>
+                                    </collect>
+                                    <ruleset>default-ruleset</ruleset>
+                                </entry>
+                                <entry>
+                                    <name>/opt/rya-streams-query-manager-${project.version}/bin/rya-streams-query-manager.sh</name>
+                                    <collect>
+                                        <from>${rpm.staging.path}/bin/rya-streams-query-manager.sh</from>
+                                    </collect>
+                                    <mode>0544</mode>
+                                </entry>
+                            </entries>
                         </configuration>
                     </execution>
                 </executions>