diff --git a/.gitignore b/.gitignore
index 645bf6d..b90d00f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,8 +76,8 @@
 /build/offsets/tracks_zip_size.hex
 /build/os.32k
 /build/os.fat12
-/build/os.fdisk
 /build/os.file
+/build/os.gdisk
 /build/os.hex_with_offsets
 /build/os.iso
 /build/os.ndisasm.disasm
diff --git a/.travis.yml b/.travis.yml
index e0d3155..41a572f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -113,7 +113,6 @@ before_install:
   - zip --help               || true
   - unzip --version          || true
   - gdisk --version          || true
-  - fdisk --version          || true
   - import --version         || true
   - Xvfb -h                  || true
   - ssh -V                   || true
diff --git a/Makefile b/Makefile
index 5b178a7..17bc902 100644
--- a/Makefile
+++ b/Makefile
@@ -63,7 +63,7 @@ built_files = ${os_filename} \
               build/os.reasm.asm \
               build/os.reasm \
               build/os.file \
-              build/os.fdisk \
+              build/os.gdisk \
               build/os.zip \
               build/os.zip.adjusted \
               build/os.iso \
@@ -97,7 +97,7 @@ os_floppy_chs_s = 9
 
 .PHONY: all
 # all: os.arm.disasm
-all: ${os_filename} build/os.ndisasm.disasm build/os.reasm.asm build/os.file build/os.fdisk build/os.offsets build/os.hex_with_offsets .gitignore build/check_makefile ${more_offset_dec} ${more_offset_hex}
+all: ${os_filename} build/os.ndisasm.disasm build/os.reasm.asm build/os.file build/os.gdisk build/os.offsets build/os.hex_with_offsets .gitignore build/check_makefile ${more_offset_dec} ${more_offset_hex}
 
 build/makefile_w_arnings: | $${@D}
 ${built_files}: | $${@D}
@@ -292,7 +292,7 @@ ${os_filename}: build/os.32k build/os.iso build/os.fat12 build/os.zip.adjusted \
 build/os.file: ${os_filename} build/check_makefile
 	file -kr $< > $@
 
-build/os.fdisk: ${os_filename} build/check_makefile
+build/os.gdisk: ${os_filename} build/check_makefile
 #       gdisk commands:
 #         * Print partition table
 #         * Recovery and transformation options
diff --git a/example-os/os.asm b/example-os/os.asm
index a874b67..2726599 100644
--- a/example-os/os.asm
+++ b/example-os/os.asm
@@ -54,7 +54,7 @@ db "ExOSxx"        ;; 0x1b8 unique disk ID (4-6 bytes? Can be any value)
 ;;; 4 bytes LBA offset
 ;;; 4 bytes LBA length
 ;;;0x1be             0x1c1  0x1c2             0x1c5  0x1c6             0x1c9  0x1ca             0x1cd
-;;; This is filled with dummy values, and later patched with fdisk.
+;;; This is filled with dummy values, and later patched with gdisk.
 db 0x80, 0x00, 0x00, 0x00,  0x01, 0x00, 0x00, 0x00,  0xa0, 0x05, 0x00, 0x00,  0x9b, 0x05, 0x00, 0x00 ;; 0x1be p1
 db 0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00 ;; 0x1ce p2
 db 0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00,  0x00, 0x00, 0x00, 0x00 ;; 0x1de p3