diff --git a/industry/scpi/.gitignore b/industry/scpi/.gitignore
new file mode 100644
index 000000000..17ba1ae81
--- /dev/null
+++ b/industry/scpi/.gitignore
@@ -0,0 +1,3 @@
+/*.tar.gz
+/scpi-parser
+
diff --git a/industry/scpi/Kconfig b/industry/scpi/Kconfig
new file mode 100644
index 000000000..d8911ecc7
--- /dev/null
+++ b/industry/scpi/Kconfig
@@ -0,0 +1,25 @@
+#
+# For a description of the syntax of this configuration file,
+# see the file kconfig-language.txt in the NuttX tools repository.
+#
+
+config SCPI_PARSER
+	tristate "SCPI instrument side parser"
+	default n
+
+config SCPI_PARSER_DEMO
+	bool "Enable the SCPI parser library demo"
+	default n
+	depends on SCPI_PARSER
+
+if SCPI_PARSER_DEMO
+
+config SCPI_PARSER_DEMO_PRIORITY
+	int "SCPI demo program priority"
+	default 100
+
+config SCPI_PARSER_DEMO_STACKSIZE
+	int "SCPI demo program stack size"
+	default DEFAULT_TASK_STACKSIZE
+
+endif
diff --git a/industry/scpi/Make.defs b/industry/scpi/Make.defs
new file mode 100644
index 000000000..a6b5c6855
--- /dev/null
+++ b/industry/scpi/Make.defs
@@ -0,0 +1,25 @@
+############################################################################
+# apps/industry/scpi/Make.defs
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+ifneq ($(CONFIG_SCPI_PARSER),)
+
+CONFIGURED_APPS += $(APPDIR)/industry/scpi
+
+endif
diff --git a/industry/scpi/Makefile b/industry/scpi/Makefile
new file mode 100644
index 000000000..730bc28c7
--- /dev/null
+++ b/industry/scpi/Makefile
@@ -0,0 +1,69 @@
+############################################################################
+# apps/industry/scpi/Makefile
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.  The
+# ASF licenses this file to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance with the
+# License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+############################################################################
+
+include $(APPDIR)/Make.defs
+
+SCPI_VERSION  = 2.2
+SCPI_UNPACK   = scpi-parser
+SCPI_TARBALL  = v$(SCPI_VERSION).tar.gz
+SCPI_URL_BASE = https://github.com/j123b567/scpi-parser/archive/refs/tags
+SCPI_URL      = $(SCPI_URL_BASE)/$(SCPI_TARBALL)
+
+CSRCS += error.c fifo.c ieee488.c
+CSRCS += minimal.c parser.c units.c utils.c
+CSRCS += lexer.c expression.c
+
+VPATH += $(SCPI_UNPACK)/libscpi/src
+
+CFLAGS += -DHAVE_STRNLEN
+CFLAGS += -DHAVE_SNPRINTF
+CFLAGS += -DHAVE_STRNDUP
+CFLAGS += -DHAVE_STRNCASECMP
+
+ifneq ($(CONFIG_SCPI_PARSER_DEMO),)
+MAINSRC = $(SCPI_UNPACK)/examples/test-interactive/main.c
+CSRCS += scpi-def.c
+
+PROGNAME  = scpidemo
+PRIORITY  = $(CONFIG_SCPI_PARSER_DEMO_PRIORITY)
+STACKSIZE = $(CONFIG_SCPI_PARSER_DEMO_STACKSIZE)
+MODULE    = $(CONFIG_SCPI_PARSER)
+
+VPATH += $(SCPI_UNPACK)/examples
+VPATH += $(SCPI_UNPACK)/examples/common
+endif # CONFIG_SCPI_PARSER_DEMO
+
+$(SCPI_TARBALL):
+	$(Q) echo "Downloading $(SCPI_TARBALL)"
+	$(Q) curl -O -L $(SCPI_URL)
+	$(Q) echo "Unpacking $(SCPI_TARBALL) to $(SCPI_UNPACK)"
+	$(Q) tar xzvf $(SCPI_TARBALL)
+	$(Q) mv scpi-parser-$(SCPI_VERSION) $(SCPI_UNPACK)
+
+# Download and unpack tarball if no git repo found
+ifeq ($(wildcard $(SCPI_UNPACK)/.git),)
+context:: $(SCPI_TARBALL)
+
+distclean::
+	$(call DELDIR, $(SCPI_UNPACK))
+	$(call DELFILE, $(SCPI_TARBALL))
+endif
+
+include $(APPDIR)/Application.mk