diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/Changelog fdutils/Changelog
--- fdutils-5.5/Changelog	2005-03-03 22:41:49.000000000 +0100
+++ fdutils/Changelog	2006-02-27 23:01:38.000000000 +0100
@@ -1,3 +1,5 @@
+v20060227
+	* Fixed "zero-based" flag
 v20050303
 	* Fixed instant verification in superformat (now based on
 	FDRAWCMD, rather than VFS' read which is plagued by excessive
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/doc/formatlist.texi fdutils/doc/formatlist.texi
--- fdutils-5.5/doc/formatlist.texi	2002-05-02 23:03:31.000000000 +0200
+++ fdutils/doc/formatlist.texi	2006-02-27 23:08:50.000000000 +0100
@@ -221,7 +221,7 @@
 setfdprm /dev/fd0H1520 1520 19 2 80 0 0x1b 0 0xcf 0x6c
 @end example
 
-@strong{Note:} This redefines the geometry for any device node with the
+@strong{NB:} This redefines the geometry for any device node with the
 same format number, not just the new node.
 
 The new geometry is only valid until the next reboot (or removal of the
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/src/fdutils.h fdutils/src/fdutils.h
--- fdutils-5.5/src/fdutils.h	2002-05-02 23:03:31.000000000 +0200
+++ fdutils/src/fdutils.h	2006-02-27 23:05:15.000000000 +0100
@@ -1,3 +1,6 @@
+#ifndef __FDUTILS_H
+#define __FDUTILS_H
+
 #include <assert.h>
 /* This file contains common structures understood by several of the
  * fdutils
@@ -22,3 +25,13 @@
 #define SafeNew(type) ((type *)(safe_malloc(sizeof(type))))
 void *safe_malloc(size_t size);
 void *safe_calloc(size_t nmemb, size_t size);
+
+#ifndef FD_SWAPSIDES
+#define FD_SWAPSIDES 2
+#endif
+
+#ifndef FD_ZEROBASED
+#define FD_ZEROBASED 4
+#endif
+
+#endif
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/src/mediaprm.c fdutils/src/mediaprm.c
--- fdutils-5.5/src/mediaprm.c	2005-03-03 21:51:06.000000000 +0100
+++ fdutils/src/mediaprm.c	2006-02-27 22:46:10.000000000 +0100
@@ -81,6 +81,7 @@
 
 	{ "swapsides", F_SWAPSIDES, 1},
 	{ "zerobased", F_ZEROBASED, 1},
+	{ "zero-based", F_ZEROBASED, 1},
 
 	{ "gap", F_GAP, 0},
 
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/src/mediaprm.lex fdutils/src/mediaprm.lex
--- fdutils-5.5/src/mediaprm.lex	2002-05-02 23:03:31.000000000 +0200
+++ fdutils/src/mediaprm.lex	2006-02-27 22:56:21.000000000 +0100
@@ -12,7 +12,7 @@
 %option pointer
 
 fid	[^\"]+
-vid     [A-Za-z_][A-Za-z0-9_]*
+vid     [A-Za-z_][A-Za-z0-9_-]*
 number	(0x[a-zA-Z0-9]+|-?[0-9]+)(KB|k|b)?
 
 %%
@@ -37,6 +37,8 @@
 }
 
 swapsides |
+zerobased |
+zero-based |
 mss      |
 2m	 |
 2M	 |
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/src/printfdprm.c fdutils/src/printfdprm.c
--- fdutils-5.5/src/printfdprm.c	2004-03-13 11:02:45.000000000 +0100
+++ fdutils/src/printfdprm.c	2006-02-27 23:06:06.000000000 +0100
@@ -136,15 +136,11 @@
 	if(level >= LEV_EXPL || (ft->track != 80 && ft->track != 40))
 		print("cyl=%d", ft->track);
 
-#ifdef FD_SWAPSIDES
 	if(ft->stretch & FD_SWAPSIDES)
 		print("swapsides",0);			
-#endif
 
-#ifdef FD_ZEROBASED
 	if(ft->stretch & FD_ZEROBASED)
 		print("zerobased",0);			
-#endif
 
 
 	if(ft->rate & FD_2M)
diff -ur --new-file --exclude-from=/home/aknaff/floppy/exclude fdutils-5.5/src/superformat.c fdutils/src/superformat.c
--- fdutils-5.5/src/superformat.c	2005-03-03 22:41:05.000000000 +0100
+++ fdutils/src/superformat.c	2006-02-27 23:06:50.000000000 +0100
@@ -805,16 +805,12 @@
 				break;
 		}
 		stretch = geometry.stretch & 1;
-#ifdef FD_ZEROBASED
 		if(geometry.stretch & FD_ZEROBASED) {
 			zeroBased = 1;
 		}
-#endif
-#ifdef FD_SWAPSIDES
 		if(geometry.stretch & FD_SWAPSIDES) {
 			swapSides = 1;
 		}
-#endif
 		mask |= SET_SECTORS | SET_CYLINDERS | 
 			SET_SIZECODE | SET_2M | SET_RATE;
 	} else {
@@ -868,12 +864,6 @@
 	}
 
 	fd[0].zeroBased = zeroBased;
-#ifndef FD_ZEROBASED
-	if(zeroBased) {
-		noverify = 1;
-	}
-#endif
-	
 	fd[0].swapSides = swapSides;
 		
 	if (cylinders > fd[0].drvprm.tracks) {