diff --git a/App/tools/driver.makefile b/App/tools/driver.makefile
index adca59483da558baa7fa4a9b59e2653dc502d6db..6d03167539e66dbc35bc07635e7adea93907fea7 100644
--- a/App/tools/driver.makefile
+++ b/App/tools/driver.makefile
@@ -885,8 +885,8 @@ ${DEPFILE}: ${LIBOBJS} $(USERMAKEFILE)
 	@echo "Collecting dependencies"
 	$(RM) $@
 	@echo "# Generated file. Do not edit." > $@
-	cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2+%p'| sort -u >> $@
-	$(foreach m,${REQ},echo "$m $(basename ${$m_VERSION})+" >> $@;)
+	cat *.d 2>/dev/null | sed 's/ /\n/g' | sed -n 's%${EPICS_MODULES}/*\([^/]*\)/\([0-9.]*\)/.*%\1 \2+%p;s%$(EPICS_MODULES)/*\([^/]*\)/\([^/]*\)/.*%\1 \2%p'| sort -u >> $@
+	$(foreach m,${REQ},echo "$m ${$m_VERSION}$(if $(filter-out $(basename ${$m_VERSION}),${$m_VERSION}),+)" >> $@;)
 
 $(BUILDRULE)
 	$(RM) MakefileInclude