diff --git a/makefile b/makefile
index 1426d07..306d1a6 100644
--- a/makefile
+++ b/makefile
@@ -1,12 +1,10 @@
 include /ioc/tools/driver.makefile
 EXCLUDE_VERSIONS = 3.13.2
-PROJECT=stream2
+PROJECT=stream
 BUILDCLASSES += Linux
 
 #DOCUDIR = doc
 
-DBDS = stream.dbd
-
 BUSSES  += AsynDriver
 BUSSES  += Dummy
 
@@ -42,9 +40,9 @@ HEADERS += StreamBuffer.h
 HEADERS += StreamError.h
 
 ifeq (${EPICS_BASETYPE},3.13)
-USR_INCLUDES += -include $(INSTALL_INCLUDE)/compat3_13.h
-endif
-ifeq (${EPICS_BASETYPE},3.14)
+# old gcc needs full path for -include
+CXXFLAGS += -include $(foreach d,${INCLUDES:-I%=%},$(wildcard $d/compat3_13.h))
+else
 RECORDTYPES += calcout
 endif
 
@@ -54,5 +52,7 @@ streamReferences:
 	perl ../src/makeref.pl Interface $(BUSSES) > $@
 	perl ../src/makeref.pl Converter $(FORMATS) >> $@
 
-stream.dbd:
+# have to hack a bit to work with both versions of driver.makefile
+DBDS = O.$${EPICSVERSION}_$${T_A}/streamSup.dbd
+../O.${EPICSVERSION}_${T_A}/streamSup.dbd:
 	perl ../src/makedbd.pl $(RECORDTYPES) > $@