diff --git a/SConstruct b/SConstruct
index 3e8cce061f8b5c8203e22877550e240b10a0be2d..1eeacf07d855c075f094bdfde41ef8f05faa2c48 100644
--- a/SConstruct
+++ b/SConstruct
@@ -45,6 +45,9 @@ import configure
 from rootcint import rootcint
 
 configure.FindROOT(baseenv)
+# If EVIO is set up, use it. Otherwise the Podd submodule will build it
+# and we will pick it up from there
+configure.FindEVIO(baseenv, build_it = False, fail_if_missing = False)
 
 bld = Builder(action=rootcint)
 baseenv.Append(BUILDERS = {'RootCint': bld})
diff --git a/podd b/podd
index f91a6ea6e929b10969f7ce405ac2e409afd8a39a..5a45ab13968cf9b9eb0fb213bbd58f668160748e 160000
--- a/podd
+++ b/podd
@@ -1 +1 @@
-Subproject commit f91a6ea6e929b10969f7ce405ac2e409afd8a39a
+Subproject commit 5a45ab13968cf9b9eb0fb213bbd58f668160748e