--- abcde.orig	Sun Oct  4 11:30:28 2015
+++ abcde	Thu Oct 22 15:51:49 2015
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!${LOCALBASE}/bin/bash
 # Copyright (c) 1998-2001 Robert Woodcock <rcw@debian.org>
 # Copyright (c) 2003-2006 Jesus Climent <jesus.climent@hispalinux.es>
 # Copyright (c) 2009-2012 Colin Tuckley <colint@debian.org>
@@ -839,6 +839,16 @@
 						${TPE2:+--TPE2 "$TPE2"} \
 						"$ABCDETEMPDIR/track$1.$OUTPUT"
 					;;
+				id3tag)
+					# FIXME # track numbers in mp3 come with 1/10, so we cannot
+					# happily substitute them with $TRACKNUM
+					run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
+						--comment=::"$COMMENTOUTPUT" -A "$DALBUM" \
+						-a "$TRACKARTIST" -s "$TRACKNAME" -y "$CDYEAR" \
+						-g "$GENREID" -t "${TRACKNUM:-$1}" \
+						${TRACKNUM:+-T "$TRACKS"} \
+						"$ABCDETEMPDIR/track$1.$OUTPUT"
+					;;
 				eyed3*)
 					# FIXME # track numbers in mp3 come with 1/10, so we cannot
 					# happily substitute them with $TRACKNUM
@@ -3471,7 +3481,7 @@
 VAPLAYLISTDATAPREFIX=''
 DOSPLAYLIST=n
 COMMENT=''
-ID3TAGV=id3v2.4
+ID3TAGV=id3tag
 ENCNICE=10
 READNICE=10
 DISTMP3NICE=10
@@ -3537,6 +3547,7 @@
 ID3=id3
 ID3V2=id3v2
 MID3V2=mid3v2
+ID3TAG=id3tag
 EYED3=eyeD3
 VORBISCOMMENT=vorbiscomment
 METAFLAC=metaflac
@@ -3621,6 +3632,7 @@
 FFMPEGENCOPTS=
 
 ID3OPTS=
+ID3TAGOPTS=
 EYED3OPTS=""
 ATOMICPARSLEYOPTS=
 CDPARANOIAOPTS=
@@ -3683,7 +3695,7 @@
 	# We won't find the eject program in OSX, and doing checkexec will fail further below...
 	unset EJECT
 elif [ X$(uname) = "XOpenBSD" ] ; then
-	HTTPGET=wget
+	HTTPGET=ftp
 	MD5SUM=md5
 	OSFLAVOUR=OBSD
 elif [ X$(uname) = "XNetBSD" ] ; then
@@ -4427,8 +4439,13 @@
 			TAGGEROPTS="--encoding utf16 $EYED3OPTS"
 		fi
 		;;
+	id3tag)
+		TAGGER="$ID3TAG"
+		ID3SYNTAX=id3tag
+		TAGGEROPTS="$ID3TAGOPTS"
+		;;
 	*)
-		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\" or \"id3v2.4\""
+		log error "Error: ID3TAGV must be either \"id3v1\", \"id3v2.3\", \"id3v2.4\" or \"id3tag\""
 		exit 1
 		;;
 esac
