diff --git a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
index 2e1efe66..49945535 100644
--- a/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
+++ b/bacnet-stack/ports/bdk-atxx4-mstp/Makefile
@@ -36,14 +36,17 @@ SIZE_OPTIONS = -t
 # jtag2slow = Atmel JTAG ICE mkII, running at 19200 Bd
 # avrispmkII = AVR ISP MKII
 # avr109 = bootloader
+ifeq (${JTAG},ftisp)
+AVRDUDE_PROGRAMMERID = ftisp
+endif
 ifeq (${JTAG},avr109)
 AVRDUDE_PROGRAMMERID = avr109
 endif
 ifeq (${JTAG},avrispmkII)
-#AVRDUDE_PROGRAMMERID = avrispmkII
+AVRDUDE_PROGRAMMERID = avrispmkII
 endif
 ifeq (${JTAG},dragon_isp)
-#AVRDUDE_PROGRAMMERID = dragon_isp
+AVRDUDE_PROGRAMMERID = dragon_isp
 endif
 ifeq (${JTAG},dragon_jtag)
 AVRDUDE_PROGRAMMERID = dragon_jtag
@@ -58,8 +61,10 @@ endif
 # port--serial or parallel port to which your
 # hardware programmer is attached
 # usb can just be usb
-AVRDUDE_PORT = usb
-#AVRDUDE_PORT = /dev/ttyUSB0
+AVRDUDE_PORT := usb
+ifeq (${JTAG},ftisp)
+AVRDUDE_PORT := /dev/ttyUSB0
+endif
 
 # Source locations
 BACNET_CORE = ../../src
diff --git a/bacnet-stack/release-branch.sh b/bacnet-stack/release-branch.sh
deleted file mode 100644
index d2e23f39..00000000
--- a/bacnet-stack/release-branch.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/sh
-# Release helper for this project
-
-PROJECT=bacnet
-SVN_MODULE=bacnet-stack
-FRS_URL=skarg,bacnet@frs.sourceforge.net:/home/frs/project/b/ba/bacnet/bacnet-stack
-
-if [ -z "$1" ] && [ -z "$2" ]
-then
-  echo "Usage: `basename $0` 0.0.0 0.0.1"
-  echo "Use dotted version as [branch-revision] [tag-revision]."
-  echo "Creates the ChangeLog."
-  echo "Creates the release files."
-  echo "Tags this branch release in subversion."
-  exit 1
-fi
-
-# convert 0.0.0 to 0-0-0
-BRANCH_VERSION_DOTTED="$1"
-BRANCH_VERSION_DASHED="$(echo "$1" | sed 's/[\.*]/-/g')"
-TAGGED_VERSION_DOTTED="$2"
-TAGGED_VERSION_DASHED="$(echo "$2" | sed 's/[\.*]/-/g')"
-echo "Creating the ${TAGGED_VERSION_DOTTED} release files for ${BRANCH_VERSION_DOTTED}"
-
-CHANGELOG=ChangeLog-${TAGGED_VERSION_DOTTED}
-echo "Creating the ${PROJECT} change log ${CHANGELOG}"
-if [ -e "${CHANGELOG}" ]
-then
-rm ${CHANGELOG}
-fi
-svn update
-svn log --xml --verbose | xsltproc svn2cl.xsl - > ${CHANGELOG}
-if [ -e "${CHANGELOG}" ]
-then
-  echo "${CHANGELOG} created."
-else
-  echo "Failed to create ${CHANGELOG}"
-  exit 1
-fi
-
-BRANCH_NAME=${SVN_MODULE}-${BRANCH_VERSION_DASHED}
-ARCHIVE_NAME=${SVN_MODULE}-${TAGGED_VERSION_DOTTED}
-TAGGED_NAME=${SVN_MODULE}-${TAGGED_VERSION_DASHED}
-SVN_BASE_URL=https://${PROJECT}.svn.sourceforge.net/svnroot/${PROJECT}
-
-SVN_BRANCH_NAME=${SVN_BASE_URL}/branches/releases/${BRANCH_NAME}
-SVN_TAGGED_NAME=${SVN_BASE_URL}/tags/${TAGGED_NAME}
-echo "Setting a tag on the ${SVN_MODULE} module called ${TAGGED_NAME}"
-svn copy ${SVN_BRANCH_NAME} ${SVN_TAGGED_NAME} -m "tagged" > /dev/null
-echo "done."
-
-if [ -d "${ARCHIVE_NAME}" ]
-then
-  echo "removing old ${ARCHIVE_NAME}..."
-  rm -rf ${ARCHIVE_NAME}
-  echo "done."
-fi
-
-echo "Getting a clean version out of subversion for Linux gzip"
-svn export ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null
-echo "done."
-
-GZIP_FILENAME=${ARCHIVE_NAME}.tgz
-echo "tar and gzip the clean directory"
-if [ -e "${GZIP_FILENAME}" ]
-then
-  echo "removing old ${GZIP_FILENAME}..."
-  rm ${GZIP_FILENAME}
-  echo "done."
-fi
-tar -cvvzf ${GZIP_FILENAME} ${ARCHIVE_NAME}/ > /dev/null
-echo "done."
-if [ -e "${GZIP_FILENAME}" ]
-then
-  echo "${GZIP_FILENAME} created."
-else
-  echo "Failed to create ${GZIP_FILENAME}"
-  exit 1
-fi
-
-if [ -d "${ARCHIVE_NAME}" ]
-then
-  echo "removing old ${ARCHIVE_NAME}..."
-  rm -rf ${ARCHIVE_NAME}
-  echo "done."
-fi
-echo "Getting another clean version out of subversion for Windows zip"
-svn export --native-eol CRLF ${SVN_TAGGED_NAME} ${ARCHIVE_NAME} > /dev/null
-ZIP_FILENAME=${ARCHIVE_NAME}.zip
-echo "done."
-echo "Zipping the directory exported for Windows."
-zip -r ${ZIP_FILENAME} ${ARCHIVE_NAME} > /dev/null
-if [ -e "${ZIP_FILENAME}" ]
-then
-  echo "${ZIP_FILENAME} created."
-else
-  echo "Failed to create ${ZIP_FILENAME}"
-  exit 1
-fi
-
-# remove SVN files
-if [ -d "${ARCHIVE_NAME}" ]
-then
-  echo "removing ${ARCHIVE_NAME}..."
-  rm -rf ${ARCHIVE_NAME}
-  echo "done."
-fi
-
-echo "Creating ${ARCHIVE_NAME}"
-mkdir ${ARCHIVE_NAME}
-mv ${ZIP_FILENAME} ${ARCHIVE_NAME}
-mv ${GZIP_FILENAME} ${ARCHIVE_NAME}
-mv ${CHANGELOG} ${ARCHIVE_NAME}
-cp readme.txt ${ARCHIVE_NAME}
-
-echo "Sending ${ARCHIVE_NAME} to SourceForge using scp..."
-scp -r ${ARCHIVE_NAME} ${FRS_URL}
-
-echo "Complete!"