diff --git a/scripts/setlocalversion b/scripts/setlocalversion
new file mode 100755
index 00000000..46989b88
--- /dev/null
+++ b/scripts/setlocalversion
@@ -0,0 +1,82 @@
+#!/bin/sh
+#
+# This scripts adds local version information from the version
+# control systems git, mercurial (hg) and subversion (svn).
+#
+# If something goes wrong, send a mail the kernel build mailinglist
+# (see MAINTAINERS) and CC Nico Schottelius
+# <nico-linuxsetlocalversion -at- schottelius.org>.
+#
+#
+
+usage() {
+	echo "Usage: $0 [srctree]" >&2
+	exit 1
+}
+
+cd "${1:-.}" || usage
+
+# Check for git and a git repo.
+if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+
+	# If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,
+	# because this version is defined in the top level Makefile.
+	if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+
+		# If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
+		# we pretty print it.
+		if atag="`git describe 2>/dev/null`"; then
+			echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+
+		# If we don't have a tag at all we print -g{commitish}.
+		else
+			printf '%s%s' -g $head
+		fi
+	fi
+
+	# Is this git on svn?
+	if git config --get svn-remote.svn.url >/dev/null; then
+	        printf -- '-svn%s' "`git svn find-rev $head`"
+	fi
+
+	# Update index only on r/w media
+	[ -w . ] && git update-index --refresh --unmerged > /dev/null
+
+	# Check for uncommitted changes
+	if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+	    | read dummy; then
+		printf '%s' -dirty
+	fi
+
+	# All done with git
+	exit
+fi
+
+# Check for mercurial and a mercurial repo.
+if hgid=`hg id 2>/dev/null`; then
+	tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+
+	# Do we have an untagged version?
+	if [ -z "$tag" -o "$tag" = tip ]; then
+		id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
+		printf '%s%s' -hg "$id"
+	fi
+
+	# Are there uncommitted changes?
+	# These are represented by + after the changeset id.
+	case "$hgid" in
+		*+|*+\ *) printf '%s' -dirty ;;
+	esac
+
+	# All done with mercurial
+	exit
+fi
+
+# Check for svn and a svn repo.
+if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
+	rev=`echo $rev | awk '{print $NF}'`
+	printf -- '-svn%s' "$rev"
+
+	# All done with svn
+	exit
+fi
diff --git a/src/Makefile b/src/Makefile
index a6739397..d9d985ee 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -8,7 +8,8 @@ BUILDDATE := `date +"%Y%m%d"`
 
 CFLAGS += -Wall -Wextra -Wno-pointer-sign -Wno-char-subscripts\
 	-O0 -std=gnu99 -g3 -DBUILDDATE=\"$(BUILDDATE)\"\
-	-I. -Iinclude -I$(HOST)
+	-I. -Iinclude -I$(HOST) \
+	-DVERSION_SUFFIX=\"`../scripts/setlocalversion`\"
 
 SRC = 	gdb_if.c	\
 	gdb_packet.c	\
diff --git a/src/adiv5_swdp.c b/src/adiv5_swdp.c
index 2c227498..432e54a4 100644
--- a/src/adiv5_swdp.c
+++ b/src/adiv5_swdp.c
@@ -54,6 +54,9 @@ int adiv5_swdp_scan(void)
 	uint8_t ack;
 
 	TARGET_LIST_FREE();
+#warning "These should be elsewhere!"
+	adiv5_free_all();
+
 	dp = (void*)calloc(1, sizeof(ADIv5_DP_t));
 
 	swdptap_init();
diff --git a/src/command.c b/src/command.c
index 26c712eb..1655cfde 100644
--- a/src/command.c
+++ b/src/command.c
@@ -87,7 +87,7 @@ int command_process(char *cmd)
 
 void cmd_version(void)
 {
-	gdb_out("Black Magic Probe (Firmware 1.5, build " BUILDDATE ")\n");
+	gdb_out("Black Magic Probe (Firmware 1.5" VERSION_SUFFIX ", build " BUILDDATE ")\n");
 	gdb_out("Copyright (C) 2011  Black Sphere Technologies Ltd.\n");
 	gdb_out("License GPLv3+: GNU GPL version 3 or later "
 		"<http://gnu.org/licenses/gpl.html>\n\n");