diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
index 0bc784e4c5..3bcea78b3b 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
+    -lsampling \
     -lgenericPatchFields \
     -llagrangian
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
index d7ede226bf..01d9e6813f 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/createFields.H
@@ -20,3 +20,4 @@ label maxPositions(readLabel(propsDict.lookup("maxPositions")));
 
 // outputFormat: raw, vtk
 //word outputFormat(propsDict.lookup("outputFormat"));
+word setFormat(propsDict.lookupOrDefault<word>("setFormat", "vtk"));
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
index 6ea6c16b93..03e6c8c243 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTrackProperties
@@ -20,4 +20,6 @@ sampleFrequency 1;
 
 maxPositions    1000000;
 
+setFormat       vtk;    // see sampleDict for set formats
+
 // ************************************************************************* //
diff --git a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
index 3f9f5d1a59..1b1d3fcac0 100644
--- a/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/particleTracks/particleTracks.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -38,6 +38,7 @@ Description
 #include "timeSelector.H"
 #include "OFstream.H"
 #include "passiveParticleCloud.H"
+#include "writer.H"
 
 using namespace Foam;
 
@@ -79,9 +80,23 @@ int main(int argc, char *argv[])
             label origId = iter().origId();
             label origProc = iter().origProc();
 
+            if (origProc >= maxIds.size())
+            {
+                // Expand size
+                maxIds.setSize(origProc+1, -1);
+            }
+
             maxIds[origProc] = max(maxIds[origProc], origId);
         }
     }
+
+    label maxNProcs = returnReduce(maxIds.size(), maxOp<label>());
+
+    Info<< "Detected particles originating from " << maxNProcs
+        << " processors." << nl << endl;
+
+    maxIds.setSize(maxNProcs, -1);
+
     Pstream::listCombineGather(maxIds, maxEqOp<label>());
     Pstream::listCombineScatter(maxIds);
 
@@ -178,56 +193,58 @@ int main(int argc, char *argv[])
         }
     }
 
+
     if (Pstream::master())
     {
-        OFstream vtkTracks(vtkPath/"particleTracks.vtk");
+        PtrList<coordSet> tracks(allTracks.size());
+        forAll(allTracks, trackI)
+        {
+            tracks.set
+            (
+                trackI,
+                new coordSet
+                (
+                    "track" + Foam::name(trackI),
+                    "distance"
+                )
+            );
+            tracks[trackI].transfer(allTracks[trackI]);
+        }
 
-        Info<< "\nWriting particle tracks to " << vtkTracks.name()
+        autoPtr<writer<scalar> > scalarFormatterPtr = writer<scalar>::New
+        (
+            setFormat
+        );
+
+        //OFstream vtkTracks(vtkPath/"particleTracks.vtk");
+        fileName vtkFile
+        (
+            scalarFormatterPtr().getFileName
+            (
+                tracks[0],
+                wordList(0)
+            )
+        );
+
+        OFstream vtkTracks
+        (
+            vtkPath
+          / "particleTracks." + vtkFile.ext()
+        );
+
+        Info<< "\nWriting particle tracks in " << setFormat
+            << " format to " << vtkTracks.name()
             << nl << endl;
 
-        // Total number of points in tracks + 1 per track
-        label nPoints = 0;
-        forAll(allTracks, trackI)
-        {
-            nPoints += allTracks[trackI].size();
-        }
 
-        vtkTracks
-            << "# vtk DataFile Version 2.0" << nl
-            << "particleTracks" << nl
-            << "ASCII" << nl
-            << "DATASET POLYDATA" << nl
-            << "POINTS " << nPoints << " float" << nl;
-
-        // Write track points to file
-        forAll(allTracks, trackI)
-        {
-            forAll(allTracks[trackI], i)
-            {
-                const vector& pt = allTracks[trackI][i];
-                vtkTracks << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
-            }
-        }
-
-        // write track (line) connectivity to file
-        vtkTracks << "LINES " << nTracks << ' ' << nPoints+nTracks << nl;
-
-        // Write ids of track points to file
-        label globalPtI = 0;
-        forAll(allTracks, trackI)
-        {
-            vtkTracks << allTracks[trackI].size();
-
-            forAll(allTracks[trackI], i)
-            {
-                vtkTracks << ' ' << globalPtI;
-                globalPtI++;
-            }
-
-            vtkTracks << nl;
-        }
-
-        Info<< "end" << endl;
+        scalarFormatterPtr().write
+        (
+            true,           // writeTracks
+            tracks,
+            wordList(0),
+            List<List<scalarField> >(0),
+            vtkTracks
+        );
     }
 
     return 0;