diff --git a/RedHat.OpenPegasus.Makefile b/RedHat.OpenPegasus.Makefile
index dbcc351..dd9de73 100644
--- a/RedHat.OpenPegasus.Makefile
+++ b/RedHat.OpenPegasus.Makefile
@@ -67,8 +67,8 @@ export SYS_INCLUDES ?= -I/usr/kerberos/include
 export LD_LIBRARY_PATH ?= $(PEGASUS_HOME)/lib
 B = $(PEGASUS_HOME)
 R = $(PEGASUS_ROOT)
-SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt
-UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
+SBINS=$(B)/bin/cimserver $(B)/bin/cimprovagt  $(B)/bin/cimauth $(B)/bin/cimconfig $(B)/bin/cimuser $(B)/bin/repupgrade
+UBINS=$(B)/bin/cimmof $(B)/bin/cimmofl $(B)/bin/cimprovider $(B)/bin/osinfo $(B)/bin/wbemexec
 BINARIES=$(SBINS) $(UBINS)
 PROVIDERS=$(B)/lib/Pegasus/providers/libComputerSystemProvider.so.1 $(B)/lib/Pegasus/providers/libOSProvider.so.1 $(B)/lib/Pegasus/providers/libProcessProvider.so.1
 LIBRARIES=$(B)/lib/libCIMQueryCapabilitiesProvider.so.1 $(B)/lib/libCIMxmlIndicationHandler.so.1 $(B)/lib/libCMPIProviderManager.so.1 $(B)/lib/libCertificateProvider.so.1 $(B)/lib/libConfigSettingProvider.so.1 $(B)/lib/libDefaultProviderManager.so.1 $(B)/lib/libNamespaceProvider.so.1 $(B)/lib/libProviderRegistrationProvider.so.1 $(B)/lib/libUserAuthProvider.so.1 $(B)/lib/libcmpiCppImpl.so.1 $(B)/lib/libpegauthentication.so.1 $(B)/lib/libpegclient.so.1 $(B)/lib/libpegcliutils.so.1 $(B)/lib/libpegcommon.so.1 $(B)/lib/libpegcompiler.so.1 $(B)/lib/libpegconfig.so.1 $(B)/lib/libpegcql.so.1 $(B)/lib/libpegexportclient.so.1 $(B)/lib/libpegexportserver.so.1 $(B)/lib/libpeggetoopt.so.1 $(B)/lib/libpeghandlerservice.so.1 $(B)/lib/libpegindicationservice.so.1 $(B)/lib/libpeglistener.so.1 $(B)/lib/libpegprm.so.1 $(B)/lib/libpegprovider.so.1 $(B)/lib/libpegprovidermanager.so.1 $(B)/lib/libpegquerycommon.so.1 $(B)/lib/libpegqueryexpression.so.1 $(B)/lib/libpegrepository.so.1 $(B)/lib/libpegserver.so.1 $(B)/lib/libpegservice.so.1 $(B)/lib/libpeguser.so.1 $(B)/lib/libpegwql.so.1
@@ -261,10 +261,16 @@ SYSDIRS  = $(D) $(D)/$(etc) $(D)/$(etc)/rc.d/init.d $(D)/$(etc)/pam.d \
 ROOTDIRS = $(D)/$(etc)/Pegasus \
 	   $(D)/$(var)/run/tog-pegasus $(D)/$(var)/run/tog-pegasus/socket \
 	   $(D)/$(var)/lib/Pegasus $(D)/$(var)/lib/Pegasus/repository \
+	   $(D)/$(var)/lib/Pegasus/repository/root/classes \
+	   $(D)/$(var)/lib/Pegasus/repository/root/instances \
+	   $(D)/$(var)/lib/Pegasus/repository/root/qualifiers \
 	   $(D)/$(var)/lib/Pegasus/cache \
 	   $(D)/$(var)/lib/Pegasus/cache/localauth \
+	   $(D)/$(var)/lib/Pegasus/cache/trace \
 	   $(D)/$(var)/lib/Pegasus/log \
-	   $(D)/$(lib)/Pegasus $(D)/$(lib)/Pegasus/providers \
+	   $(D)/$(lib)/Pegasus \
+	   $(D)/$(lib)/Pegasus/providers \
+	   $(D)/$(lib)/cmpi \
 	   $(D)/$(share)/Pegasus/scripts
 PEGDIRS =  $(D)/$(share)/Pegasus \
 	   $(D)/$(share)/Pegasus/mof/CIM29 \
@@ -372,7 +378,7 @@ SDK:
 	touch SDK
 
 ghost_files:
-	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/log/install.log}}
+	touch $(D){/etc/Pegasus/{cimserver_current.conf,cimserver_planned.conf,cimserver_trust,indication_trust,crl,ssl.cnf,client.pem,server.pem,file.pem,},/var/{run/tog-pegasus/{cimxml.socket,cimserver.pid,cimserver_start.lock},lib/Pegasus/{log/install.log,cache/trace/cimserver.trc}}}
 
 repository:
 	PATH=$(B)/bin:$$PATH LD_LIBRARY_PATH=$(B)/lib $(MAKE) -C Schemas/Pegasus repository REPOSITORY_DIR=$(D)/$(var)/lib/Pegasus
diff --git a/tog-pegasus.spec b/tog-pegasus.spec
index 6613bb8..cc5ee36 100644
--- a/tog-pegasus.spec
+++ b/tog-pegasus.spec
@@ -60,6 +60,7 @@ Patch8:			pegasus-2.5.1-pam-wbem.patch
 Patch9:			pegasus-2.5.1-parallel_make.patch
 Patch10:		pegasus-2.5.1-fix_zseries_flags.patch
 Patch11:		pegasus-2.5.1-fix_tests.patch
+Patch12:		pegasus-2.5.1-AutoPtr-Core.patch
 #
 Conflicts: 		openwbem
 Provides: 		tog-pegasus-cimserver
@@ -126,6 +127,7 @@ The OpenPegasus WBEM tests for the OpenPegasus %{version} Linux rpm.
 %patch9 -p1 -b .parallel-make
 %patch10 -p1 -b .fix-zseries-flags
 %patch11 -p1 -b .fix-tests
+%patch12 -p1 -b .AutoPtr-Core
 
 %build
 rm -rf ${RPM_BUILD_ROOT} || :;
@@ -174,6 +176,7 @@ make -f RedHat.OpenPegasus.Makefile install prefix=$RPM_BUILD_ROOT libdir=%{_lib
 /var/lib/Pegasus/cache
 %dir /var/lib/Pegasus/log
 %ghost /var/lib/Pegasus/log/install.log
+%ghost /var/lib/Pegasus/cache/trace/cimserver.trc
 %dir   %attr(1750,root,pegasus) /var/run/tog-pegasus
 %ghost /var/run/tog-pegasus/cimserver.pid
 %ghost /var/run/tog-pegasus/cimserver_start.lock