diff --git a/release/Makefile.ec2 b/release/Makefile.ec2
index 1a18229a7b0e..041e77651102 100644
--- a/release/Makefile.ec2
+++ b/release/Makefile.ec2
@@ -15,9 +15,15 @@ SVN_CMD=   ${_P}/${_S}
 .  endfor
 . endfor
 .endif
-.if exists($SRCTOP/.svn)
-EC2_SVNBRANCH!=	${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
-EC2_SVNREV!=	${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+.if exists(${SRCTOP}/.svn)
+.  if empty(${EC2_SVNBRANCH})
+   EC2_SVNBRANCH!=	${SVN_CMD} info --show-item relative-url ${WORLDDIR} | sed -e 's/\^\///'
+.  export EC2_SVNBRANCH
+.  endif
+.  if empty(${EC2_SVNREV})
+   EC2_SVNREV!=	${SVN_CMD} info --show-item last-changed-revision ${WORLDDIR}
+.  export EC2_SVNREV
+.  endif
 .else
 EC2_SVNBRANCH=	unknown
 EC2_SVNREV=	unknown