diff --git a/Formula/gptfdisk.rb b/Formula/gptfdisk.rb
index 2a7306e885a..3ef6622e280 100644
--- a/Formula/gptfdisk.rb
+++ b/Formula/gptfdisk.rb
@@ -3,7 +3,7 @@ class Gptfdisk < Formula
   homepage "https://www.rodsbooks.com/gdisk/"
   url "https://downloads.sourceforge.net/project/gptfdisk/gptfdisk/1.0.5/gptfdisk-1.0.5.tar.gz"
   sha256 "0e7d3987cd0488ecaf4b48761bc97f40b1dc089e5ff53c4b37abe30bc67dcb2f"
-  license "GPL-2.0"
+  license "GPL-2.0-or-later"
 
   livecheck do
     url :stable
@@ -18,6 +18,13 @@ class Gptfdisk < Formula
 
   depends_on "popt"
 
+  uses_from_macos "ncurses"
+
+  # Fix Big Sur compilation issue with 1.0.5; the physical *.dylib files
+  # are no longer present directly on the filesystem, but the linker still
+  # knows what to do.
+  patch :DATA
+
   def install
     system "make", "-f", "Makefile.mac"
     %w[cgdisk fixparts gdisk sgdisk].each do |program|
@@ -27,8 +34,23 @@ class Gptfdisk < Formula
   end
 
   test do
-    system "hdiutil", "create", "-size", "128k", "test.dmg"
-    output = shell_output("#{bin}/gdisk -l test.dmg")
-    assert_match "Found valid GPT with protective MBR", output
+    system "dd", "if=/dev/zero", "of=test.dmg", "bs=1m", "count=1"
+    assert_match "completed successfully", shell_output("#{bin}/sgdisk -o test.dmg")
+    assert_match "GUID", shell_output("#{bin}/sgdisk -p test.dmg")
+    assert_match "Found valid GPT with protective MBR", shell_output("#{bin}/gdisk -l test.dmg")
   end
 end
+
+__END__
+diff -ur a/Makefile.mac b/Makefile.mac
+--- a/Makefile.mac	2020-02-17 22:34:11.000000000 +0000
++++ b/Makefile.mac	2020-12-05 22:12:04.000000000 +0000
+@@ -21,7 +21,7 @@
+ #	$(CXX) $(LIB_OBJS) -L/usr/lib -licucore gpttext.o gdisk.o -o gdisk
+ 
+ cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o
+-	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o /usr/lib/libncurses.dylib $(LDFLAGS) $(FATBINFLAGS) -o cgdisk
++	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o -L/usr/lib -lncurses $(LDFLAGS) $(FATBINFLAGS) -o cgdisk
+ #	$(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licucore -lncurses -o cgdisk
+ 
+ sgdisk: $(LIB_OBJS) gptcl.o sgdisk.o