diff --git a/libs/ardour/zeroconf.cc b/libs/ardour/zeroconf.cc
index 57180f96b8..d349ab3b4e 100644
--- a/libs/ardour/zeroconf.cc
+++ b/libs/ardour/zeroconf.cc
@@ -137,8 +137,8 @@ ZeroConf::start ()
 	std::string avahi_exec;
 
 	PBD::Searchpath sp (ARDOUR::ardour_dll_directory ());
-	if (!PBD::find_file (sp, "ardour-avahi.sh", avahi_exec)) {
-		PBD::warning << "ardour-avahi.sh was not found." << endmsg;
+	if (!PBD::find_file (sp, "ardour-avahi", avahi_exec)) {
+		PBD::warning << _("ardour-avahi tool was not found.") << endmsg;
 		return false;
 	}
 
diff --git a/tools/linux_packaging/build b/tools/linux_packaging/build
index 9b31e7f2c3..48278cc23e 100755
--- a/tools/linux_packaging/build
+++ b/tools/linux_packaging/build
@@ -506,8 +506,8 @@ EOF
 	chmod +x $APPLIB/ardour-util.sh
 fi
 
-cp $BUILD_ROOT/avahi.sh $APPLIB/ardour-avahi.sh
-chmod +x $APPLIB/ardour-avahi.sh
+cp $BUILD_ROOT/libs/ardour-avahi $APPLIB/ardour-avahi
+chmod +x $APPLIB/ardour-avahi
 
 OURLIBDIR=$BUILD_ROOT/libs
 OURLIBS=$OURLIBDIR/ctrl-interface/midi_surface:$OURLIBDIR/ctrl-interface/control_protocol:$OURLIBDIR/ardour:$OURLIBDIR/midi++2:$OURLIBDIR/pbd:$OURLIBDIR/gtkmm2ext:$OURLIBDIR/glibmm2:$OURLIBDIR/canvas:$OURLIBDIR/widgets:$OURLIBDIR/waveview:$OURLIBDIR/evoral:$OURLIBDIR/evoral/src/libsmf:$OURLIBDIR/audiographer:$OURLIBDIR/temporal:$OURLIBDIR/libltc:$OURLIBDIR/qm-dsp:$OURLIBDIR/ardouralsautil:$OURLIBDIR/ptformat:$BUILD_ROOT/gtk2_ardour
diff --git a/wscript b/wscript
index 044766011a..39761da5f5 100644
--- a/wscript
+++ b/wscript
@@ -1622,7 +1622,7 @@ def build(bld):
 
         obj              = bld(features = 'subst')
         obj.source       = 'tools/avahi.sh'
-        obj.target       = 'libs/ardour-avahi.sh'
+        obj.target       = 'libs/ardour-avahi'
         obj.chmod        = Utils.O755
         obj.install_path = bld.env['LIBDIR']