diff --git a/Makefile b/Makefile
index 968e62fac..887764b52 100644
--- a/Makefile
+++ b/Makefile
@@ -176,7 +176,7 @@ ifeq ($(OS), Haiku)
 CXXFLAGS += -D_DEFAULT_SOURCE
 endif
 
-YOSYS_VER := 0.54+17
+YOSYS_VER := 0.54+23
 YOSYS_MAJOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f1)
 YOSYS_MINOR := $(shell echo $(YOSYS_VER) | cut -d'.' -f2)
 YOSYS_COMMIT := $(shell echo $(YOSYS_VER) | cut -d'.' -f3)
diff --git a/kernel/yosys.cc b/kernel/yosys.cc
index 1dff87309..ab47ded69 100644
--- a/kernel/yosys.cc
+++ b/kernel/yosys.cc
@@ -189,13 +189,16 @@ int run_command(const std::string &command, std::function<void(const std::string
 #endif
 
 bool already_setup = false;
+bool already_shutdown = false;
 
 void yosys_setup()
 {
 	if(already_setup)
 		return;
 	already_setup = true;
+	already_shutdown = false;
 	new backward::SignalHandling;
+
 #ifdef WITH_PYTHON
 	// With Python 3.12, calling PyImport_AppendInittab on an already
 	// initialized platform fails (such as when libyosys is imported
@@ -226,12 +229,11 @@ bool yosys_already_setup()
 	return already_setup;
 }
 
-bool already_shutdown = false;
-
 void yosys_shutdown()
 {
 	if(already_shutdown)
 		return;
+	already_setup = false;
 	already_shutdown = true;
 	log_pop();