--- pkg/version.c.orig	2014-02-02 05:33:30.000000000 +1100

+++ pkg/version.c	2014-02-13 15:34:07.000000000 +1100

@@ -318,7 +318,7 @@

 				opt |= VERSION_SOURCE_REMOTE;

 		}

-		if (!have_ports && (opt & (VERSION_SOURCE_INDEX|VERSION_SOURCE_PORTS)))

+		if (!have_ports && (opt & VERSION_SOURCE_PORTS))

 			err(1, "Unable to open ports directory %s", portsdir);

 		/* Only force remote mode if looking up remote, otherwise

@@ -341,9 +341,13 @@

 			goto cleanup;

 		if (opt & VERSION_SOURCE_INDEX) {

-			uname(&u);

-			rel_major_ver = (int) strtol(u.release, NULL, 10);

-			snprintf(indexpath, sizeof(indexpath), "%s/INDEX-%d", portsdir, rel_major_ver);

+			if (argc == 1) {

+				snprintf(indexpath, sizeof(indexpath), "%s", argv[0]);

+			} else {

+				uname(&u);

+				rel_major_ver = (int) strtol(u.release, NULL, 10);

+				snprintf(indexpath, sizeof(indexpath), "%s/INDEX-%d", portsdir, rel_major_ver);

+			}

 			indexfile = fopen(indexpath, "r");

 			if (!indexfile)

 				err(EX_SOFTWARE, "Unable to open %s!", indexpath);