diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 59ae1a7..321a98d 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -546,6 +546,11 @@
 	${RM} ${STAGING_PATH}/${SKY130A}/libs.ref/sky130_fd_sc_ms/verilog/*.*.v
 	${RM} ${STAGING_PATH}/${SKY130A}/libs.ref/sky130_fd_sc_ls/verilog/*.*.v
 	${RM} ${STAGING_PATH}/${SKY130A}/libs.ref/sky130_fd_sc_lp/verilog/*.*.v
+	# Apply extra PDK patches until they get fixed properly in the source
+	patch -p1 -f -d ${STAGING_PATH}/${SKY130A}/libs.ref/sky130_fd_sc_hd/techlef \
+		< custom/patches/hd_minenclosed.squeaky.patch || true
+	patch -p1 -f -d ${STAGING_PATH}/${SKY130A}/libs.ref/sky130_fd_sc_hdll/techlef \
+		< custom/patches/hdll_minenclosed.squeaky.patch || true
 	# Install alphanumeric library.
 	${STAGE} -source ${REPO_PATH} -target ${STAGING_PATH}/${SKY130A} \
 		-mag %l/mag/*.mag filter=custom/scripts/text2m5.py \
diff --git a/sky130/custom/patches/hd_minenclosed.squeaky.patch b/sky130/custom/patches/hd_minenclosed.squeaky.patch
new file mode 100644
index 0000000..64376e7
--- /dev/null
+++ b/sky130/custom/patches/hd_minenclosed.squeaky.patch
@@ -0,0 +1,20 @@
+diff --git a/sky130_fd_sc_hd.tlef b/sky130_fd_sc_hd.tlef
+index 1c913ba..815b750 100644
+--- a/sky130_fd_sc_hd.tlef
++++ b/sky130_fd_sc_hd.tlef
+@@ -107,6 +107,7 @@ LAYER met1
+      WIDTH 3 0.28 ;
+   AREA 0.083 ;                     # Met1 6
+   THICKNESS 0.35 ;
++  MINENCLOSEDAREA 0.14 ;
+
+   ANTENNAMODEL OXIDE1 ;
+   ANTENNADIFFSIDEAREARATIO PWL ( ( 0 400 ) ( 0.0125 400 ) ( 0.0225 2609 ) ( 22.5 11600 ) ) ;
+@@ -149,6 +150,7 @@ LAYER met2
+      WIDTH 3 0.28 ;
+   AREA 0.0676 ;                       # Met2 6
+   THICKNESS 0.35 ;
++  MINENCLOSEDAREA 0.14 ;
+
+   EDGECAPACITANCE 37.759E-6 ;
+   CAPACITANCE CPERSQDIST 16.9423E-6 ;
diff --git a/sky130/custom/patches/hdll_minenclosed.squeaky.patch b/sky130/custom/patches/hdll_minenclosed.squeaky.patch
new file mode 100644
index 0000000..5d8dba5
--- /dev/null
+++ b/sky130/custom/patches/hdll_minenclosed.squeaky.patch
@@ -0,0 +1,21 @@
+diff --git a/sky130_fd_sc_hdll.tlef b/sky130_fd_sc_hdll.tlef
+index 1c913ba..815b750 100644
+--- a/sky130_fd_sc_hdll.tlef
++++ b/sky130_fd_sc_hdll.tlef
+@@ -107,6 +107,7 @@ LAYER met1
+      WIDTH 3 0.28 ;
+   AREA 0.083 ;                     # Met1 6
+   THICKNESS 0.35 ;
++  MINENCLOSEDAREA 0.14 ;
+
+   ANTENNAMODEL OXIDE1 ;
+   ANTENNADIFFSIDEAREARATIO PWL ( ( 0 400 ) ( 0.0125 400 ) ( 0.0225 2609 ) ( 22.5 11600 ) ) ;
+@@ -149,6 +150,7 @@ LAYER met2
+      WIDTH 3 0.28 ;
+   AREA 0.0676 ;                       # Met2 6
+   THICKNESS 0.35 ;
++  MINENCLOSEDAREA 0.14 ;
+
+   EDGECAPACITANCE 37.759E-6 ;
+   CAPACITANCE CPERSQDIST 16.9423E-6 ;
+