diff --git a/.gitignore b/.gitignore
index e1a8926..50e667c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,14 +36,15 @@
 /texinfo.tex
 
 # Repo specific items
-/*.o
+*.o
 /config.h
 /config.h.in~
 /config.log
 /config.status
 /phosphor-gpio-monitor
-/Makefile
-/.deps
+Makefile
+.deps
 /*-libtool
 /test/.deps
 /test/Makefile
+phosphor-gpio-util
diff --git a/Makefile.am b/Makefile.am
index 3e55c5b..d664672 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,4 +17,4 @@
                                  $(PHOSPHOR_LOGGING_CFLAGS) \
                                  $(LIBEVDEV_CFLAGS)
 
-SUBDIRS = test
+SUBDIRS = test gpio-util
diff --git a/configure.ac b/configure.ac
index 4a05a22..ae95205 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,5 +46,5 @@
 )
 
 # Create configured output
-AC_CONFIG_FILES([Makefile test/Makefile])
+AC_CONFIG_FILES([Makefile gpio-util/Makefile test/Makefile])
 AC_OUTPUT
diff --git a/gpio-util/Makefile.am b/gpio-util/Makefile.am
new file mode 100644
index 0000000..ea8c763
--- /dev/null
+++ b/gpio-util/Makefile.am
@@ -0,0 +1,8 @@
+AM_DEFAULT_SOURCE_EXT = .cpp
+AM_CPPFLAGS = -iquote ${top_srcdir}
+
+sbin_PROGRAMS = \
+	phosphor-gpio-util
+
+phosphor_gpio_util_SOURCES = \
+	main.cpp
diff --git a/gpio-util/main.cpp b/gpio-util/main.cpp
new file mode 100644
index 0000000..b8801aa
--- /dev/null
+++ b/gpio-util/main.cpp
@@ -0,0 +1,20 @@
+/**
+ * Copyright © 2017 IBM Corporation
+ *
+ * Licensed 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.
+ */
+
+int main(int argc, char** argv)
+{
+    return 0;
+}