diff --git a/.cvsignore b/.cvsignore
index feb54a3..4ed84e8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setroubleshoot-0.14.tar.gz
+setroubleshoot-0.15.tar.gz
diff --git a/setroubleshoot.init b/setroubleshoot.init
index 9b4b7b5..10abe2d 100755
--- a/setroubleshoot.init
+++ b/setroubleshoot.init
@@ -28,36 +28,37 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
 test `id -u` = 0  || exit 4
 
 # Check config
-test -x /usr/sbin/setroubleshootd  || exit 5
+test -x /usr/sbin/setroubleshoot  || exit 5
 
 RETVAL=0
 
-prog="setroubleshootd"
+prog="setroubleshoot"
+exe="setroubleshootd"
 
 start(){
     echo -n $"Starting $prog: "
     unset HOME MAIL USER USERNAME
-    daemon $prog "$EXTRAOPTIONS"
+    daemon $exe "$EXTRAOPTIONS"
     RETVAL=$?
     echo
     if test $RETVAL = 0 ; then
-        touch /var/lock/subsys/setroubleshootd
+        touch /var/lock/subsys/setroubleshoot
     fi
     return $RETVAL
 }
 
 stop(){
     echo -n $"Stopping $prog: "
-    killproc $prog
+    killproc $exe
     RETVAL=$?
     echo
-    rm -f /var/lock/subsys/setroubleshootd
+    rm -f /var/lock/subsys/setroubleshoot
     return $RETVAL
 }
 
 reload(){
     echo -n $"Reloading configuration: "	
-    killproc $prog -HUP
+    killproc $exe -HUP
     RETVAL=$?
     echo
     return $RETVAL
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index 76bfe26..224c1a6 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.14
+Version: 0.15
 Release: 1
 License: GPL
 Group: Applications/System
@@ -78,6 +78,7 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc %{pkgdocdir}
+%{_bindir}/*
 %{_sbindir}/*
 %{auditlibdir}/*
 %{pkgpythondir}
@@ -93,6 +94,11 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Jul 26 2006 Dan Walsh <dwalsh@redhat.com> - 0.15-1
+-  Karl MacMillan 
+	* Add generic templating mechanism to Plugin
+	* Ported all plugins to use templating mechanism
+
 * Sat Jul 22 2006 Dan Walsh <dwalsh@redhat.com> - 0.13-1
 - Fixes to plugins
 - Fixes to dispatcher
diff --git a/sources b/sources
index be5650c..ca7b0f0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22558c35056acc87ca6b04da8cd9c722  setroubleshoot-0.14.tar.gz
+f07dea1b1d86430559b60ffaa327e466  setroubleshoot-0.15.tar.gz