Index: /branches/ipp-magic-v0/psconfig/psbuild
===================================================================
--- /branches/ipp-magic-v0/psconfig/psbuild	(revision 21496)
+++ /branches/ipp-magic-v0/psconfig/psbuild	(revision 21497)
@@ -1,3 +1,10 @@
 #!/usr/bin/env perl
+
+# Get the CVS tag
+$cvsNameString= '$Name: not supported by cvs2svn $';
+if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+    $cvsTag = $1;
+} 
+else { die "ERROR: cannot parse CVS tag string\n"; }
 
 $tagsets = "tagsets";
@@ -96,6 +103,6 @@
 
 if ( @ARGV == 0) {
-    @list = <$tagsets/*.dist>;
-    $distribution = $list[-1];
+    $defaultversion = $cvsTag;
+    $file="$tagsets/$defaultversion.dist";
 } else {
     $distribution = "$tagsets/$ARGV[0].dist";
Index: /branches/ipp-magic-v0/psconfig/pschecklibs
===================================================================
--- /branches/ipp-magic-v0/psconfig/pschecklibs	(revision 21496)
+++ /branches/ipp-magic-v0/psconfig/pschecklibs	(revision 21497)
@@ -1,3 +1,14 @@
 #!/usr/bin/env perl
+
+# Get the CVS tag
+$cvsNameString= '$Name: not supported by cvs2svn $';
+if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+    $cvsTag = $1;
+} 
+else { die "ERROR: cannot parse CVS tag string\n"; }
+# Strip off release version number if present
+if ( $cvsTag =~ /^(.+)\-\d*$/ ) {
+    $cvsTag = $1;
+}
 
 $tagsets = "tagsets";
@@ -39,6 +50,6 @@
 
 if ( @ARGV == 0) {
-    @list = <$tagsets/*.libs>;
-    $file = $list[-1];
+    $defaultversion=$cvsTag;
+    $file="$tagsets/$defaultversion.libs";
 } else {
     $file = "$tagsets/$ARGV[0].libs";
Index: /branches/ipp-magic-v0/psconfig/pscheckperl
===================================================================
--- /branches/ipp-magic-v0/psconfig/pscheckperl	(revision 21496)
+++ /branches/ipp-magic-v0/psconfig/pscheckperl	(revision 21497)
@@ -1,3 +1,14 @@
 #!/usr/bin/env perl
+
+# Get the CVS tag
+$cvsNameString= '$Name: not supported by cvs2svn $';
+if ( $cvsNameString =~ /\$Name: not supported by cvs2svn $/ ) {
+    $cvsTag = $1;
+} 
+else { die "ERROR: cannot parse CVS tag string\n"; }
+# Strip off release version number if present
+if ( $cvsTag =~ /^(.+)\-\d*$/ ) {
+    $cvsTag = $1;
+}
 
 $tagsets = "tagsets";
@@ -32,6 +43,6 @@
 
 if ( @ARGV == 0) { 
-    @list = <$tagsets/*.perl>;
-    $file = $list[-1];
+    $defaultversion=$cvsTag;
+    $file="$tagsets/$defaultversion.perl";
 } else {
     $file = "$tagsets/$ARGV[0].perl";