diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/CMakeLists.txt b/Tracking/TrkEventCnv/TrkTruthAthenaPool/CMakeLists.txt
new file mode 100644
index 0000000000000000000000000000000000000000..dde5ec416eefe2775b68b64b78954b408163cbb4
--- /dev/null
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/CMakeLists.txt
@@ -0,0 +1,23 @@
+################################################################################
+# Package: TrkTruthAthenaPool
+################################################################################
+
+# Declare the package name:
+atlas_subdir( TrkTruthAthenaPool )
+
+# Declare the package's dependencies:
+atlas_depends_on_subdirs( PUBLIC
+                          GaudiKernel
+                          PRIVATE
+                          Control/StoreGate
+                          Database/AthenaPOOL/AthenaPoolCnvSvc
+                          Database/AthenaPOOL/AthenaPoolUtilities
+                          Tracking/TrkEvent/TrkTruthData
+                          Tracking/TrkEventCnv/TrkTruthTPCnv )
+
+# Component(s) in the package:
+atlas_add_poolcnv_library( TrkTruthAthenaPoolPoolCnv
+                           src/*.cxx
+                           FILES TrkTruthData/PRD_MultiTruthCollection.h TrkTruthData/TrackTruthCollection.h TrkTruthData/DetailedTrackTruthCollection.h
+                           LINK_LIBRARIES GaudiKernel StoreGateLib SGtests AthenaPoolCnvSvcLib AthenaPoolUtilities TrkTruthData TrkTruthTPCnv )
+
diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.cxx b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.cxx
index a59e84916cb5c5eb5b842b2893147c3036843e00..ae33d20cffe011fad4be5da79cffc2840c318ef2 100755
--- a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.cxx
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.cxx
@@ -23,7 +23,7 @@ PRD_MultiTruthCollectionPERS* PRD_MultiTruthCollectionCnv::createPersistent(PRD_
   MsgStream log(messageService(), "PRD_MultiTruthCollectionCnv");
   log<<MSG::DEBUG<<"Writing PRD_MultiTruthCollection_p2"<<endreq;
   PRD_MultiTruthCollectionPERS* pers=new PRD_MultiTruthCollectionPERS();
-  m_converter_p2.transToPers(trans,pers,log); 
+  m_converter_p2.transToPers(trans,pers,log);
   return pers;
 }
 
diff --git a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
index f140baeff74ce3adf1461b8b539cd6c79ae79620..f3cb01a8809ab705316c133184e197966f398e8f 100755
--- a/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
+++ b/Tracking/TrkEventCnv/TrkTruthAthenaPool/src/PRD_MultiTruthCollectionCnv.h
@@ -13,12 +13,8 @@
 
 namespace Trk { class PRD_MultiTruthCollection_p2; }
 
-//typedef Trk::PRD_MultiTruthCollection_p2 PRD_MultiTruthCollectionPERS;
-#ifdef __IDENTIFIER_64BIT__
 typedef Trk::PRD_MultiTruthCollection_p2 PRD_MultiTruthCollectionPERS;
-#else
-typedef Trk::PRD_MultiTruthCollection_p1 PRD_MultiTruthCollectionPERS;
-#endif
+
 
 typedef T_AthenaPoolCustomCnv<PRD_MultiTruthCollection,PRD_MultiTruthCollectionPERS> PRD_MultiTruthCollectionCnvBase;