diff --git a/Makefile b/Makefile
index dc813e9c..1f603a41 100644
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,7 @@ MAG_FILES := $(sort $(wildcard $(SRAM_LIB_DIR)/cells/*/*.mag))
 SPICE_SUFFIX := spice
 SPICE_LVS_SUFFIX := lvs.$(SPICE_SUFFIX)
 SPICE_CALIBRE_SUFFIX := lvs.calibre.$(SPICE_SUFFIX)
+SPICE_KLAYOUT_SUFFIX := lvs.klayout.$(SPICE_SUFFIX)
 SPICE_BASE_SUFFIX := base.$(SPICE_SUFFIX)
 ALL_SPICE_FILES := $(sort $(wildcard $(SRAM_LIB_DIR)/cells/*/*.$(SPICE_SUFFIX)))
 
@@ -49,7 +50,7 @@ ifndef PDK_ROOT
 	$(error PDK_ROOT is undefined, please export it before running make)
 endif
 
-$(SKY130_PDKS_DIR): check-pdk-root
+$(SKY130_PDKS_DIR): check-pdk-root 
 	git clone https://github.com/google/skywater-pdk.git $(PDK_ROOT)/skywater-pdk
 	cd $(SKY130_PDKS_DIR) && \
 		git checkout main && git pull && \
@@ -148,6 +149,18 @@ $(INSTALL_BASE)/calibre_lvs_lib: $(filter %.$(SPICE_CALIBRE_SUFFIX),$(ALL_SPICE_
 	@echo "=================================================================="
 	@echo
 
+$(INSTALL_BASE)/klayout_lvs_lib: $(filter %.$(SPICE_KLAYOUT_SUFFIX),$(ALL_SPICE_FILES))
+	@echo
+	@echo "Setting up klayout LVS library for OpenRAM."
+	@echo "=================================================================="
+	mkdir -p $@
+	@for SP in $?; do \
+		cp -va $$SP $@/$$(basename $$SP .$(SPICE_KLAYOUT_SUFFIX)).sp; \
+	done
+	@echo "=================================================================="
+	@echo
+
+
 $(INSTALL_BASE)/sp_lib: $(filter-out %.$(SPICE_LVS_SUFFIX) %.$(SPICE_CALIBRE_SUFFIX),$(ALL_SPICE_FILES))
 	@echo
 	@echo "Setting up spice simulation library for OpenRAM."