diff --git a/VERSION b/VERSION
index bbe50a46b..4a8538221 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.02.64(2)-cvs (2010-04-14)
+2.02.64(2)-cvs (2010-04-30)
diff --git a/VERSION_DM b/VERSION_DM
index d81cecd1c..4425e9e0c 100644
--- a/VERSION_DM
+++ b/VERSION_DM
@@ -1 +1 @@
-1.02.47-cvs (2010-04-14)
+1.02.47-cvs (2010-04-30)
diff --git a/WHATS_NEW b/WHATS_NEW
index bac865ff5..22d0480bb 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,12 +1,13 @@
-Version 2.02.64 -
+Version 2.02.64 - 30th April 2010
 =================================
+  Avoid pointless initialisation when the 'version' command is run directly.
   Fix memory leak for invalid regex pattern input.
   Display invalid regex pattern for filter configuration in case of error.
   Remove no-longer-used arg_ptr_value.
-  Fix -M and --type to use strings not pointers that change on config refresh.
+  Fix -M and --type to use strings, not pointers that change on config refresh.
   Fix lvconvert error message when existing mirrored LV is not found.
-  Disallow the direct removal of a merging snapshot.
   Set appropriate udev flags for reserved LVs.
+  Disallow the direct removal of a merging snapshot.
   Don't preload the origin when removing a snapshot whose merge is pending.
   Disallow the addition of mirror images while a conversion is happening.
   Disallow primary mirror image removal when mirror is not in-sync.
@@ -15,9 +16,10 @@ Version 2.02.64 -
   Increment lvm2app version from 1 to 2 (memory allocation changes).
   Change lvm2app memory alloc/free for pv/vg/lv properties.
   Change daemon lock filename from lvm2_monitor to lvm2-monitor for consistency.
-  Add awk script relpath.awk to calculate paths for relative symlinks.
-  Fix double DESTDIR usage for infodir and mandir.
   Install symbolic .so links with relative paths between usrlibdir and libdir.
+  Add awk script relpath.awk to calculate paths for relative symlinks.
+  Use @AWK@ in makefiles.
+  Fix double DESTDIR usage for infodir and mandir.
 
 Version 2.02.63 - 14th April 2010
 =================================
diff --git a/WHATS_NEW_DM b/WHATS_NEW_DM
index c222fc63a..a4df28c54 100644
--- a/WHATS_NEW_DM
+++ b/WHATS_NEW_DM
@@ -1,4 +1,4 @@
-Version 1.02.47 -
+Version 1.02.47 - 30th April 2010
 =================================
   Add support for new IMPORT{db} udev rule.
   Add DM_UDEV_PRIMARY_SOURCE_FLAG udev flag to recognize proper DM events.
diff --git a/configure b/configure
index 3c8c9a628..f0ce6915f 100755
--- a/configure
+++ b/configure
@@ -15607,6 +15607,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
 
 
 
+
 
 
 ################################################################################
diff --git a/daemons/clvmd/clvmd-command.c b/daemons/clvmd/clvmd-command.c
index 091232e42..d69bfc26c 100644
--- a/daemons/clvmd/clvmd-command.c
+++ b/daemons/clvmd/clvmd-command.c
@@ -371,6 +371,7 @@ static int restart_clvmd(void)
 	/*
 	 * Build the command-line
 	 */
+	/* FIXME missing strup error checks */
 	argv[0] = strdup("clvmd");
 
 	/* Propogate debug options */
diff --git a/man/clvmd.8.in b/man/clvmd.8.in
index 8e5b8288d..53a9113a8 100644
--- a/man/clvmd.8.in
+++ b/man/clvmd.8.in
@@ -76,10 +76,11 @@ re-read the lvm configuration file. This command should be run whenever the
 devices on a cluster system are changed.
 .TP
 .I \-S
-Tells the running clvmd to exit and restart. This is a preferred option
-to killing and restarting clvmd as it will preserve exclusive LV locks.
-If a full stop & restart is done instead, exclusive LV locks will be
-re-acquired as shared.
+Tells the running clvmd to exit and reexecute itself, for example at the
+end of a package upgrade.  The new instance is instructed to reacquire
+any locks in the same state as they were previously held.  (Alternative
+methods of restarting the daemon have the side effect of changing
+exclusive LV locks into shared locks.)
 .TP
 .I \-I
 Selects the cluster manager to use for locking and internal communications,
diff --git a/scripts/relpath.awk b/scripts/relpath.awk
index 0d3c1ef17..26fe1eeaa 100755
--- a/scripts/relpath.awk
+++ b/scripts/relpath.awk
@@ -1,4 +1,4 @@
-#!/bin/awk -f
+#!/usr/bin/awk -f
 #
 # Copyright (C) 2010 Red Hat, Inc. All rights reserved.
 #