diff --git a/doc/disk-ampro.md b/doc/disk-ampro.md
index 0d5091a9..d8f1f295 100644
--- a/doc/disk-ampro.md
+++ b/doc/disk-ampro.md
@@ -19,13 +19,15 @@ Reading discs
 Just do:
 
 ```
-fluxengine read ampro400
+fluxengine read ampro <format>
 ```
 
-You should end up with an `ampro.img` which is 409600. If you have a
-double-sided disk, use `ampro800`, which will give you a file819200 bytes long.
-These is an alias for `fluxengine read ibm` with preconfigured parameters.  You
-can pass this straight into [cpmtools](http://www.moria.de/~michael/cpmtools/):
+...where `<format>` is one of `--400` for a 40-track disk or `--800` for an
+80-track disk.  These are an alias for `fluxengine read ibm` with preconfigured
+parameters.
+
+FluxEngine has direct filesystem support for these disks, or you can pass the
+disk images into [cpmtools](http://www.moria.de/~michael/cpmtools/):
 
 ```
 $ cpmls -f ampdsdd ampro.img
diff --git a/src/formats/ampro.textpb b/src/formats/ampro.textpb
new file mode 100644
index 00000000..800bb06d
--- /dev/null
+++ b/src/formats/ampro.textpb
@@ -0,0 +1,58 @@
+comment: 'Ampro 5.25" family'
+
+image_writer {
+	filename: "ampro.img"
+	type: IMG
+}
+
+layout {
+	sides: 2
+	layoutdata {
+		sector_size: 1024
+		physical {	
+			start_sector: 17
+			count: 5
+		}
+	}
+}
+
+decoder {
+	ibm {}
+}
+
+filesystem {
+	type: CPMFS
+	cpmfs {
+		filesystem_start {
+			track: 1
+		}
+		block_size: 2048
+		dir_entries: 128
+	}
+}
+
+option_group {
+	comment: "Format variant"
+
+	option {
+		name: "400"
+		comment: "400kB 40-track DSDD"
+
+		config {
+			layout {
+				tracks: 40
+			}
+		}
+	}
+
+	option {
+		name: "800"
+		comment: "800kB 80-track DSDD"
+
+		config {
+			layout {
+				tracks: 80
+			}
+		}
+	}
+}
diff --git a/src/formats/ampro400.textpb b/src/formats/ampro400.textpb
deleted file mode 100644
index 22447bd1..00000000
--- a/src/formats/ampro400.textpb
+++ /dev/null
@@ -1,22 +0,0 @@
-comment: 'Ampro 400kB/800kB 5.25" 40/80 track SSDD/DSDD (ro)'
-
-image_writer {
-	filename: "ampro.img"
-	type: IMG
-}
-
-layout {
-	tracks: 80
-	sides: 1
-	layoutdata {
-		sector_size: 1024
-		physical {	
-			start_sector: 17
-			count: 5
-		}
-	}
-}
-
-decoder {
-	ibm {}
-}
diff --git a/src/formats/ampro800.textpb b/src/formats/ampro800.textpb
deleted file mode 100644
index 5d18cd40..00000000
--- a/src/formats/ampro800.textpb
+++ /dev/null
@@ -1,22 +0,0 @@
-comment: 'Ampro 400kB/800kB 5.25" 40/80 track SSDD/DSDD (ro)'
-
-image_writer {
-	filename: "ampro.img"
-	type: IMG
-}
-
-layout {
-	tracks: 80
-	sides: 2
-	layoutdata {
-		sector_size: 1024
-		physical {	
-			start_sector: 17
-			count: 5
-		}
-	}
-}
-
-decoder {
-	ibm {}
-}
diff --git a/src/formats/build.mk b/src/formats/build.mk
index c6c390c1..f3dc3e00 100644
--- a/src/formats/build.mk
+++ b/src/formats/build.mk
@@ -5,8 +5,7 @@ FORMATS = \
 	aeslanier \
 	agat840 \
 	amiga \
-	ampro400 \
-	ampro800 \
+	ampro \
 	apple2_drive \
 	apple2 \
 	atarist \