diff --git a/VERSION b/VERSION
index 7632c68..2ed9a2a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.342
+1.0.344
diff --git a/scripts/configure b/scripts/configure
index b5f03f5..bb114b0 100755
--- a/scripts/configure
+++ b/scripts/configure
@@ -606,6 +606,7 @@
 SKY130_ML_XX_HD_PATH
 PATCH
 MAGIC
+XCIRCUIT_DISABLED
 XSCHEM_DISABLED
 QFLOW_DISABLED
 OPENLANE_DISABLED
@@ -685,6 +686,7 @@
 enable_openlane
 enable_qflow
 enable_xschem
+enable_xcircuit
 enable_alpha_sky130
 enable_xschem_sky130
 enable_klayout_sky130
@@ -1357,6 +1359,10 @@
                 Enable or disable xschem setup [default=enabled]
 
 
+  --enable-xcircuit
+                Enable or disable xcircuit setup [default=enabled]
+
+
   --enable-alpha-sky130[=path]
                           Install sky130_ml_xx_hd. If path is omitted, the repository
                           will be downloaded. [default=enabled]
@@ -2451,8 +2457,8 @@
 # Set variables for tool setups
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Found tools: klayout magic netgen irsim openlane qflow xschem" >&5
-$as_echo "$as_me: Found tools: klayout magic netgen irsim openlane qflow xschem" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Found tools: klayout magic netgen irsim openlane qflow xschem xcircuit" >&5
+$as_echo "$as_me: Found tools: klayout magic netgen irsim openlane qflow xschem xcircuit" >&6;}
 
 
 
@@ -2563,6 +2569,21 @@
 
 
 
+        XCIRCUIT_DISABLED=0
+        # Check whether --enable-xcircuit was given.
+if test "${enable_xcircuit+set}" = set; then :
+  enableval=$enable_xcircuit;
+                if test "$enableval" == "no" -o "$enableval" == "NO"; then
+                    XCIRCUIT_DISABLED=1
+                fi
+
+
+fi
+
+
+
+
+
 # Magic
 # Extract the first word of "magic", so it can be a program name with args.
 set dummy magic; ac_word=$2
@@ -3258,8 +3279,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: Tools enabled for PDK setup installation: klayout magic netgen irsim openlane qflow xschem" >&5
-$as_echo "$as_me: Tools enabled for PDK setup installation: klayout magic netgen irsim openlane qflow xschem" >&6;}
+{ $as_echo "$as_me:${as_lineno-$LINENO}: Tools enabled for PDK setup installation: klayout magic netgen irsim openlane qflow xschem xcircuit" >&5
+$as_echo "$as_me: Tools enabled for PDK setup installation: klayout magic netgen irsim openlane qflow xschem xcircuit" >&6;}
 
 # Check for "--with-ef-style"
 EF_STYLE=0
diff --git a/scripts/tools.txt b/scripts/tools.txt
index 648b3dc..82c5603 100644
--- a/scripts/tools.txt
+++ b/scripts/tools.txt
@@ -5,3 +5,4 @@
 openlane
 qflow
 xschem
+xcircuit
diff --git a/sky130/Makefile.in b/sky130/Makefile.in
index 0baaf20..94846cd 100644
--- a/sky130/Makefile.in
+++ b/sky130/Makefile.in
@@ -938,6 +938,8 @@
 		cp ${KLAYOUT_PATH}/sky130_tech/tech/sky130/${TECH}.lyt ${KLAYOUT_STAGING_$*}/tech/${SKY130$*}.lyt ; \
 		cp -rp ${KLAYOUT_PATH}/scripts/* ${KLAYOUT_STAGING_$*}/scripts/ ; \
 	fi
+	# Copy original DRC deck from open_pdks (is this useful?)
+	cp klayout/sky130.lydrc ${KLAYOUT_STAGING_$*}/drc/${SKY130$*}.lydrc
 	# Copy drc directory contents from the Efabless Open MPW precheck repository
 	if test "x${PRECHECK_PATH}" != "x" ; then \
 		cp ${PRECHECK_PATH}/checks/tech-files/sky130A_mr.drc ${KLAYOUT_STAGING_$*}/drc/${SKY130$*}_mr.drc ; \