diff -up util-linux-ng-2.15.1-rc1/misc-utils/blkid.8.kzak util-linux-ng-2.15.1-rc1/shlibs/blkid.8
--- util-linux-ng-2.15.1-rc1/misc-utils/blkid.8.kzak	2009-06-04 15:37:18.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/misc-utils/blkid.8	2009-06-04 15:40:18.000000000 +0200
@@ -64,7 +64,7 @@ more devices.
 Read from
 .I cachefile
 instead of reading from the default cache file
-.IR /etc/blkid.tab .
+.IR /etc/blkid/blkid.tab .
 If you want to start with a clean cache (i.e. don't report devices previously
 scanned but not necessarily available at this time), specify
 .IR /dev/null .
@@ -179,7 +179,7 @@ Display version number and exit.
 Write the device cache to
 .I writecachefile
 instead of writing it to the default cache file
-.IR /etc/blkid.tab .
+.IR /etc/blkid/blkid.tab .
 If you don't want to save the cache to the default file, specify
 .IR /dev/null.
 If not specified it will be the same file as that given by the
diff -up util-linux-ng-2.15.1-rc1/misc-utils/blkid.c.kzak util-linux-ng-2.15.1-rc1/shlibs/blkid.c
--- util-linux-ng-2.15.1-rc1/misc-utils/blkid.c.kzak	2009-06-04 15:40:32.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/misc-utils/blkid.c	2009-06-04 15:40:55.000000000 +0200
@@ -60,7 +60,7 @@ static void usage(int error)
 		"        [-t <token>] [-w <file>] [dev ...]\n\n"
 		"  %1$s -p [-O <offset>] [-S <size>] [-o format] <dev> [dev ...]\n\n"
 		"Options:\n"
-		"  -c <file>   cache file (default: /etc/blkid.tab, /dev/null = none)\n"
+		"  -c <file>   cache file (default: /etc/blkid/blkid.tab, /dev/null = none)\n"
 		"  -h          print this usage message and exit\n"
 		"  -g          garbage collect the blkid cache\n"
 		"  -o <format> output format; can be one of:\n"
diff -up util-linux-ng-2.15.1-rc1/shlibs/blkid/libblkid.3.kzak util-linux-ng-2.15.1-rc1/libs/blkid/libblkid.3
--- util-linux-ng-2.15.1-rc1/shlibs/blkid/libblkid.3.kzak	2009-06-04 15:42:38.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/shlibs/blkid/libblkid.3	2009-06-04 15:43:20.000000000 +0200
@@ -24,7 +24,7 @@ A common use is to allow use of LABEL= a
 specific block device names into configuration files.
 .P
 Block device information is normally kept in a cache file
-.I /etc/blkid.tab
+.I /etc/blkid/blkid.tab
 and is verified to still be valid before being returned to the user
 (if the user has read permission on the raw block device, otherwise not).
 The cache file also allows unprivileged users (normally anyone other
@@ -59,7 +59,7 @@ symlink does not match with LABEL or UUI
 .I CACHE_FILE=<path>
 Overrides the standard location of the cache file. This setting can be
 overridden by the environment variable BLKID_FILE. Default is
-.I /etc/blkid.tab.
+.I /etc/blkid/blkid.tab.
 .TP
 .I EVALUATE=<methods>
 Defines LABEL and UUID evaluation method(s). Currently, the libblkid library
@@ -77,7 +77,7 @@ from Ted Ts'o.  The library was subseque
 The low-level probing code was rewritten by Karel Zak.
 .SH FILES
 .TP 18
-.I /etc/blkid.tab
+.I /etc/blkid/blkid.tab
 caches data extracted from each recognized block device
 .TP
 .I /etc/blkid.conf
diff -up util-linux-ng-2.15.1-rc1/shlibs/blkid/src/blkidP.h.kzak util-linux-ng-2.15.1-rc1/libs/blkid/src/blkidP.h
--- util-linux-ng-2.15.1-rc1/shlibs/blkid/src/blkidP.h.kzak	2009-06-04 15:38:32.000000000 +0200
+++ util-linux-ng-2.15.1-rc1/shlibs/blkid/src/blkidP.h	2009-06-04 15:39:14.000000000 +0200
@@ -222,7 +222,7 @@ struct blkid_struct_cache
 extern char *blkid_strdup(const char *s);
 extern char *blkid_strndup(const char *s, const int length);
 
-#define BLKID_CACHE_FILE	"/etc/blkid.tab"
+#define BLKID_CACHE_FILE	"/etc/blkid/blkid.tab"
 #define BLKID_CONFIG_FILE	"/etc/blkid.conf"
 
 #define BLKID_ERR_IO	 5