diff --git a/thin_dump.cc b/thin_dump.cc
index f70a95f..c01ce62 100644
--- a/thin_dump.cc
+++ b/thin_dump.cc
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <getopt.h>
+#include <libgen.h>
 
 #include "human_readable_format.h"
 #include "metadata_dumper.h"
@@ -74,7 +75,7 @@ int main(int argc, char **argv)
 	while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
 		switch(c) {
 			case 'h':
-				usage(argv[0]);
+				usage(basename(argv[0]));
 				return 0;
 			case 'f':
 				format = optarg;
@@ -89,7 +90,7 @@ int main(int argc, char **argv)
 	}
 
 	if (argc == 1) {
-		usage(argv[0]);
+		usage(basename(argv[0]));
 		return 1;
 	}
 
diff --git a/thin_repair.cc b/thin_repair.cc
index 8e47efb..30b9c7e 100644
--- a/thin_repair.cc
+++ b/thin_repair.cc
@@ -18,6 +18,7 @@
 
 #include <iostream>
 #include <getopt.h>
+#include <libgen.h>
 
 #include "metadata.h"
 #include "metadata_checker.h"
@@ -61,7 +62,7 @@ int main(int argc, char **argv)
 	while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
 		switch(c) {
 			case 'h':
-				usage(argv[0]);
+				usage(basename(argv[0]));
 				return 0;
 			case 'V':
 				cerr << THIN_PROVISIONING_TOOLS_VERSION << endl;
@@ -70,7 +71,7 @@ int main(int argc, char **argv)
 	}
 
 	if (argc != 2) {
-		usage(argv[0]);
+		usage(basename(argv[0]));
 		exit(1);
 	}
 
diff --git a/thin_restore.cc b/thin_restore.cc
index 43aa3cc..041e4e7 100644
--- a/thin_restore.cc
+++ b/thin_restore.cc
@@ -26,6 +26,7 @@
 #include <fstream>
 #include <iostream>
 #include <getopt.h>
+#include <libgen.h>
 
 using namespace persistent_data;
 using namespace std;
@@ -78,7 +79,7 @@ int main(int argc, char **argv)
 	while ((c = getopt_long(argc, argv, shortopts, longopts, NULL)) != -1) {
 		switch(c) {
 			case 'h':
-				usage(argv[0]);
+				usage(basename(argv[0]));
 				return 0;
 			case 'i':
 				input = optarg;
@@ -93,7 +94,7 @@ int main(int argc, char **argv)
 	}
 
 	if (argc == 1) {
-		usage(argv[0]);
+		usage(basename(argv[0]));
 		return 1;
 	}
 
diff --git a/version.h.in b/version.h.in
new file mode 100644
index 0000000..3a42ab6
--- /dev/null
+++ b/version.h.in
@@ -0,0 +1,21 @@
+/*
+ * Copyright (C) 2011 Red Hat, Inc. All rights reserved.
+ *
+ * This file is part of Thin Provisioing Tools.
+ *
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License v.3.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#ifndef _THIN_PROVISIONING_TOOLS_VERSION_H
+/**
+ * The Thin Provisioning Tools version number
+ */
+
+#define THIN_PROVISIONING_TOOLS_VERSION @THIN_PROVISIONING_TOOLS_VERSION@
+#endif