diff --git a/Makefile_ccdb b/Makefile_ccdb
index 9533655..67e13e2 100644
--- a/Makefile_ccdb
+++ b/Makefile_ccdb
@@ -6,6 +6,7 @@ ifdef CCDB_VERSION
   else
     CCDB_DIR = ccdb_$(CCDB_VERSION)
   endif
+  MAJOR_VERSION := $(shell echo $(CCDB_VERSION) | cut -d. -f1)
 else
   CCDB_DIR = ccdb
   GET_SOURCE_TARGET = $(CCDB_DIR)/.clone_done
@@ -20,10 +21,17 @@ else
   ifndef CCDB_BRANCH
     CCDB_BRANCH = master
   endif
+  MAJOR_VERSION := 2
 endif
 UNTAR_TEMP_DIR := untar_temp_dir_$(shell echo $$RANDOM)
 
-all: force_rebuild_action $(CCDB_DIR)/.scons_done
+ifeq '$(MAJOR_VERSION)' '1'
+  BUILD_TARGET = $(CCDB_DIR)/.scons_done
+else
+  BUILD_TARGET = $(CCDB_DIR)/.make_install_done
+endif
+
+all: force_rebuild_action $(BUILD_TARGET)
 
 force_rebuild_action:
 ifdef FORCE
@@ -62,4 +70,29 @@ $(CCDB_DIR)/.scons_done: $(CCDB_DIR)/.untar_local_scons
 	python2 scripts/scons.py
 	date > $@
 
+$(CCDB_DIR)/.cmake_done: $(GET_SOURCE_TARGET)
+	cd $(CCDB_DIR)/cpp; mkdir -pv build
+	cd $(CCDB_DIR)/cpp/build; \
+		cmake3 -DSQLite3_INCLUDE_DIR=$(SQLITE_HOME)/include \
+		-DSQLite3_LIBRARY=$(SQLITE_HOME)/lib ..
+	date > $@
+
+$(CCDB_DIR)/.make_done: $(CCDB_DIR)/.cmake_done
+	cd $(CCDB_DIR)/cpp/build; make VERBOSE=1
+	date > $@
+
+$(CCDB_DIR)/.make_install_done: $(CCDB_DIR)/.make_done
+	@echo Makefile_ccdb info: install target should be done via cmake, doing it by hand
+	cd $(CCDB_DIR); mkdir -pv lib
+	install $(CCDB_DIR)/cpp/build/src/CCDB/libccdb.a $(CCDB_DIR)/lib/
+	cd $(CCDB_DIR); mkdir -pv include/CCDB
+	install -v $(CCDB_DIR)/cpp/src/CCDB/*.h $(CCDB_DIR)/include/CCDB
+	cd $(CCDB_DIR); mkdir -pv include/CCDB/Providers
+	install -v $(CCDB_DIR)/cpp/src/CCDB/Providers/*.h $(CCDB_DIR)/include/CCDB/Providers
+	cd $(CCDB_DIR); mkdir -pv include/CCDB/Model
+	install -v $(CCDB_DIR)/cpp/src/CCDB/Model/*.h $(CCDB_DIR)/include/CCDB/Model
+	cd $(CCDB_DIR); mkdir -pv include/CCDB/Helpers
+	install -v $(CCDB_DIR)/cpp/src/CCDB/Helpers/*.h $(CCDB_DIR)/include/CCDB/Helpers
+	date > $@
+
 # end of makefile
diff --git a/Makefile_jana b/Makefile_jana
index 252edfb..ca16f3b 100644
--- a/Makefile_jana
+++ b/Makefile_jana
@@ -47,6 +47,10 @@ $(JANA_HOME)/.sconstruct_done: $(SOURCE_CODE_TARGET)
 	cd $(JANA_HOME); $(SCONS) $(JANA_SCONS_OPTIONS)
 	date > $@
 
+$(JANA_HOME)/.patches_done: $(SOURCE_CODE_TARGET)
+	cd $(JANA_HOME)/SBMS; patch sbms.py < $(BUILD_SCRIPTS)/patches/jana/sbms.py.patch
+	date > $@
+
 $(JANA_HOME)/.checkout_done:
 	rm -rf checkout_temp_dir
 	mkdir checkout_temp_dir
diff --git a/patches/jana/sbms.py.patch b/patches/jana/sbms.py.patch
index 81be2e5..e730b59 100644
--- a/patches/jana/sbms.py.patch
+++ b/patches/jana/sbms.py.patch
@@ -1,3 +1,26 @@
+<<<<<<< HEAD
+--- sbms.py.original	2020-03-27 11:38:47.910624018 -0400
++++ sbms.py.patched	2020-03-27 11:56:28.324675578 -0400
+@@ -516,13 +516,18 @@
+ ##################################
+ def AddCCDB(env):
+ 	ccdb_home = os.getenv('CCDB_HOME', 'none')
++	sqlite_home = os.getenv('SQLITE_HOME', 'none')
+ 	if(ccdb_home != 'none'):
+ 		CCDB_CPPPATH = "%s/include" % (ccdb_home)
+ 		CCDB_LIBPATH = "%s/lib" % (ccdb_home)
+ 		CCDB_LIBS = "ccdb"
++		SQLITE_LIBPATH = "%s/lib" % (sqlite_home)
++		SQLITE_LIBS = "sqlite3"
+ 		env.AppendUnique(CPPPATH = [CCDB_CPPPATH])
+ 		env.AppendUnique(LIBPATH = [CCDB_LIBPATH])
+ 		env.AppendUnique(LIBS    = [CCDB_LIBS])
++		env.AppendUnique(LIBS    = [SQLITE_LIBS])
++		env.AppendUnique(LIBS    = ['fmt'])
+ 
+ 
+ ##################################
+=======
 --- sbms.py.original	2020-06-12 17:49:55.468018385 -0400
 +++ sbms.py.patched	2020-06-19 21:28:36.714653683 -0400
 @@ -212,13 +212,14 @@
@@ -114,3 +137,4 @@
  		os.chdir(curpath)
  
  
+>>>>>>> master