diff --git a/ChangeLog b/ChangeLog
index fb6ae259..95ad0724 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22112,3 +22112,5 @@
 	* Fixed a regression in the 'Edit Audio Settings'
 	('RDExportSettingsDialog') dialog that made it impossible to
 	select any sample rate other than 32000.
+2021-07-28 Fred Gleason <fredg@paravelsystems.com>
+	* Added a '--enable-i18n-updates' switch to '.configure'.
diff --git a/configure.ac b/configure.ac
index 7ebbc185..61b8b2af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,6 +101,8 @@ AC_ARG_ENABLE(mp4v2,[  --disable-mp4           disable M4A decode support],
 		      [MP4V2_DISABLED=yes],[])
 AC_ARG_ENABLE(rdxport-debug,[  --enable-rdxport-debug  enable DEBUG support for RDXport services],
 		      [RDXPORT_DEBUG_ENABLED=yes],[])
+AC_ARG_ENABLE(i18n-updates,[  --enable-i18n-updates   enable I18N metadata updates],
+		      [I18N_ENABLED=yes],[])
 
 
 #
@@ -205,6 +207,15 @@ case "$ar_distro_id" in
      ;;
 esac
 
+#
+# Internationalization
+#
+if test $I18N_ENABLED ; then
+   AC_SUBST(I18N_ACTIVE,1)
+else
+   AC_SUBST(I18N_ACTIVE,0)
+fi
+
 #
 # Check for Expat
 #
@@ -537,6 +548,7 @@ AC_CONFIG_FILES([rivendell.spec \
     icons/Makefile \
     helpers/Makefile \
     helpers/install_python.sh \
+    helpers/rdi18n_helper.sh \
     apis/Makefile \
     apis/pypad/Makefile \
     apis/pypad/api/Makefile \
@@ -626,6 +638,7 @@ AC_CONFIG_FILES([rivendell.spec \
     ])
 AC_OUTPUT()
 
+chmod 755 helpers/rdi18n_helper.sh
 chmod 755 helpers/install_python.sh
 chmod 755 xdg/install_usermode.sh
 chmod 755 build_debs.sh
@@ -656,6 +669,11 @@ AC_MSG_NOTICE("|---------------------------------------------------------|")
 AC_MSG_NOTICE("| Platform Information:                                   |")
 AC_MSG_NOTICE("$DISTRO_NAME")
 AC_MSG_NOTICE("$DISTRO_FAMILY")
+if test $I18N_ENABLED ; then
+AC_MSG_NOTICE("|                            Update I18N Data ... Yes     |")
+else
+AC_MSG_NOTICE("|                            Update I18N Data ... No      |")
+fi
 AC_MSG_NOTICE("|                                                         |")
 AC_MSG_NOTICE("| Configured Audio Drivers:                               |")
 if test -z $USING_ALSA ; then
diff --git a/helpers/Makefile.am b/helpers/Makefile.am
index 6bf42a7d..fd5b672e 100644
--- a/helpers/Makefile.am
+++ b/helpers/Makefile.am
@@ -2,7 +2,7 @@
 ##
 ## helper/ Automake.am for Rivendell
 ##
-## (C) Copyright 2003-2005,2016 Fred Gleason <fredg@paravelsystems.com>
+## (C) Copyright 2003-2021 Fred Gleason <fredg@paravelsystems.com>
 ##
 ## Use automake to process this into a Makefile.in
 ##
@@ -33,7 +33,8 @@ dist_cwrap_SOURCES = cwrap.cpp cwrap.h
 
 dist_jsmin_SOURCES = jsmin.c
 
-EXTRA_DIST = install_python.sh.in\
+EXTRA_DIST = rdi18n_helper.sh.in\
+             install_python.sh.in\
              rdpack.sh\
              rdtrans.sh\
              rdtransgui.sh\
@@ -44,6 +45,7 @@ CLEANFILES = *~\
              moc_*
 
 DISTCLEANFILES = docbook\
+                 rdi18n_helper.sh\
                  install_python.sh
 
 MAINTAINERCLEANFILES = *~\
diff --git a/helpers/rdi18n_helper.sh.in b/helpers/rdi18n_helper.sh.in
new file mode 100644
index 00000000..e59da21f
--- /dev/null
+++ b/helpers/rdi18n_helper.sh.in
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+# rdi18n_helper.sh
+#
+# Helper script for managing internationalization files for Rivendell
+#
+# (C) Copyright 2021 Fred Gleason <fredg@paravelsystems.com>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License version 2 as
+#   published by the Free Software Foundation.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free Software
+#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+
+USAGE="rdi18n_helper.sh --install|--uninstall|--update <basename> <installdir>"
+
+OPERATION=$1
+BASENAME=$2
+INSTALLDIR=$3
+
+if test -z $BASENAME ; then
+    echo $USAGE
+    exit 1
+fi
+
+function Install {
+    mkdir -p ${INSTALLDIR}
+    cp ${BASENAME}_*.qm ${INSTALLDIR}/
+}
+
+
+function Uninstall {
+    rm -f ${INSTALLDIR}/${BASENAME}_*.qm
+}
+
+
+function Update {
+    if test @I18N_ACTIVE@ -eq 1 ; then
+	@QT_LUPDATE@ ${BASENAME}.pro
+    fi
+    @QT_LRELEASE@ ${BASENAME}.pro
+}
+
+if test $OPERATION = "--install" ; then
+    Install
+    exit 0
+fi
+
+if test $OPERATION = "--uninstall" ; then
+    Uninstall
+    exit 0
+fi
+
+if test $OPERATION = "--update" ; then
+    Update
+    exit 0
+fi
+
+echo $USAGE
+exit 1
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6a795d56..178c4c31 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -22,8 +22,6 @@
 
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@ -Wno-strict-aliasing -std=c++11 -fPIC -I/usr/include/taglib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 CWRAP = ../helpers/cwrap
 
 # The dependency for qt's Meta Object Compiler (moc)
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp librd_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install librd $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/librd_*.qm
+	../helpers/rdi18n_helper.sh --uninstall librd $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) lib.pro
-	$(LRELEASE) lib.pro
+	../helpers/rdi18n_helper.sh --update librd $(DESTDIR)$(prefix)/share/rivendell
 
 lib_LTLIBRARIES = librd.la
 dist_librd_la_SOURCES = dbversion.h\
@@ -438,7 +434,7 @@ nodist_librd_la_SOURCES = moc_rdadd_cart.cpp\
 
 librd_la_LDFLAGS = -release $(VERSION)
 
-EXTRA_DIST = lib.pro\
+EXTRA_DIST = librd.pro\
              librd_cs.ts\
              librd_de.ts\
              librd_es.ts\
diff --git a/lib/lib.pro b/lib/librd.pro
similarity index 100%
rename from lib/lib.pro
rename to lib/librd.pro
diff --git a/rdadmin/Makefile.am b/rdadmin/Makefile.am
index 224b8c1a..5acf97f9 100644
--- a/rdadmin/Makefile.am
+++ b/rdadmin/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 CWRAP = ../helpers/cwrap
 
 # The dependency for qt's Meta Object Compiler (moc)
@@ -39,15 +37,13 @@ global_credits.c:
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdadmin_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdadmin $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdadmin_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdadmin $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdadmin.pro
-	$(LRELEASE) rdadmin.pro
+	../helpers/rdi18n_helper.sh --update rdadmin $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdadmin
 
diff --git a/rdairplay/Makefile.am b/rdairplay/Makefile.am
index 17979fa1..cad2863a 100644
--- a/rdairplay/Makefile.am
+++ b/rdairplay/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -I$(top_srcdir)/lib  -Wno-strict-aliasing -std=c++11 -fPIC @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdairplay_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdairplay $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdairplay_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdairplay $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdairplay.pro
-	$(LRELEASE) rdairplay.pro
+	../helpers/rdi18n_helper.sh --update rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdairplay
 
diff --git a/rdcartslots/Makefile.am b/rdcartslots/Makefile.am
index 1b3c012e..d5fc01ef 100644
--- a/rdcartslots/Makefile.am
+++ b/rdcartslots/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdcartslots_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdcartslots $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcartslots_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdcartslots.pro
-	$(LRELEASE) rdcartslots.pro
+	../helpers/rdi18n_helper.sh --update rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdcartslots
 
diff --git a/rdcastmanager/Makefile.am b/rdcastmanager/Makefile.am
index 3de3f29c..f146e57b 100644
--- a/rdcastmanager/Makefile.am
+++ b/rdcastmanager/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC  -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdcastmanager_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdcastmanager $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcastmanager_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdcastmanager $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdcastmanager.pro
-	$(LRELEASE) rdcastmanager.pro
+	../helpers/rdi18n_helper.sh --update rdcastmanager $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdcastmanager
 
diff --git a/rdcatch/Makefile.am b/rdcatch/Makefile.am
index 62887b64..8bf8f88d 100644
--- a/rdcatch/Makefile.am
+++ b/rdcatch/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdcatch_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdcatch_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdcatch.pro
-	$(LRELEASE) rdcatch.pro
+	../helpers/rdi18n_helper.sh --update rdcatch $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdcatch
 
diff --git a/rdhpi/Makefile.am b/rdhpi/Makefile.am
index 62a6d081..45ce3fd4 100644
--- a/rdhpi/Makefile.am
+++ b/rdhpi/Makefile.am
@@ -24,8 +24,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 CWRAP = ../helpers/cwrap
 
 # The dependency for qt's Meta Object Compiler (moc)
@@ -38,15 +36,13 @@ html_%.cpp:	%.html
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdhpi_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdhpi $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdhpi_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdhpi $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdhpi.pro
-	$(LRELEASE) rdhpi.pro
+	../helpers/rdi18n_helper.sh --update rdhpi $(DESTDIR)$(prefix)/share/rivendell
 
 lib_LTLIBRARIES = librdhpi.la
 dist_librdhpi_la_SOURCES = rdhpiinformation.cpp rdhpiinformation.h\
diff --git a/rdlibrary/Makefile.am b/rdlibrary/Makefile.am
index 56704e45..52e084e4 100644
--- a/rdlibrary/Makefile.am
+++ b/rdlibrary/Makefile.am
@@ -23,8 +23,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -32,15 +30,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdlibrary_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdlibrary $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlibrary_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdlibrary $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdlibrary.pro
-	$(LRELEASE) rdlibrary.pro
+	../helpers/rdi18n_helper.sh --update rdlibrary $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdlibrary
 
diff --git a/rdlogedit/Makefile.am b/rdlogedit/Makefile.am
index 9cc841c9..5d4d6ff3 100644
--- a/rdlogedit/Makefile.am
+++ b/rdlogedit/Makefile.am
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,15 +28,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdlogedit_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdlogedit $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogedit_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdlogedit $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdlogedit.pro
-	$(LRELEASE) rdlogedit.pro
+	../helpers/rdi18n_helper.sh --update rdlogedit $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdlogedit
 
diff --git a/rdlogin/Makefile.am b/rdlogin/Makefile.am
index 604d66cc..7dd71388 100644
--- a/rdlogin/Makefile.am
+++ b/rdlogin/Makefile.am
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,15 +28,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdlogin_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdlogin $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogin_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdlogin $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdlogin.pro
-	$(LRELEASE) rdlogin.pro
+	../helpers/rdi18n_helper.sh --update rdlogin $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdlogin
 
diff --git a/rdlogmanager/Makefile.am b/rdlogmanager/Makefile.am
index 1731386d..9900c3ef 100644
--- a/rdlogmanager/Makefile.am
+++ b/rdlogmanager/Makefile.am
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,15 +28,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdlogmanager_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdlogmanager $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdlogmanager_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdlogmanager $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdlogmanager.pro
-	$(LRELEASE) rdlogmanager.pro
+	../helpers/rdi18n_helper.sh --update rdlogmanager $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdlogmanager
 
diff --git a/rdmonitor/Makefile.am b/rdmonitor/Makefile.am
index e542f11f..56a9ff1a 100644
--- a/rdmonitor/Makefile.am
+++ b/rdmonitor/Makefile.am
@@ -1,6 +1,6 @@
 ## Makefile.am
 ##
-## (C) Copyright 2012-2020 Fred Gleason <fredg@paravelsystems.com>
+## (C) Copyright 2012-2021 Fred Gleason <fredg@paravelsystems.com>
 ##
 ##   This program is free software; you can redistribute it and/or modify
 ##   it under the terms of the GNU General Public License version 2 as
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,15 +28,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdmonitor_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdmonitor $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdmonitor_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdmonitor $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdmonitor.pro
-	$(LRELEASE) rdmonitor.pro
+	../helpers/rdi18n_helper.sh --update rdmonitor $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdmonitor
 
diff --git a/rdpanel/Makefile.am b/rdpanel/Makefile.am
index bae75cb3..5852ce64 100644
--- a/rdpanel/Makefile.am
+++ b/rdpanel/Makefile.am
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,15 +28,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdpanel_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdpanel $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdpanel_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdpanel $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdpanel.pro
-	$(LRELEASE) rdpanel.pro
+	../helpers/rdi18n_helper.sh --update rdpanel $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdpanel
 
diff --git a/rdselect/Makefile.am b/rdselect/Makefile.am
index 9cdeacb4..3ed2acb1 100644
--- a/rdselect/Makefile.am
+++ b/rdselect/Makefile.am
@@ -21,8 +21,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -30,19 +28,17 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-hook:
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdselect_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../helpers/rdi18n_helper.sh --install rdselect $(DESTDIR)$(prefix)/share/rivendell
 	mkdir -p $(DESTDIR)/etc/auto.master.d
 	cp rd.audiostore.autofs $(DESTDIR)/etc/auto.master.d/
 	touch $(DESTDIR)/etc/auto.rd.audiostore
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdselect_*.qm
+	../helpers/rdi18n_helper.sh --uninstall rdselect $(DESTDIR)$(prefix)/share/rivendell
 	rm -f $(DESTDIR)/etc/auto.master.d/rd.audiostore.autofs
 
 all:	
-	$(LUPDATE) rdselect.pro
-	$(LRELEASE) rdselect.pro
+	../helpers/rdi18n_helper.sh --update rdselect $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdselect
 
diff --git a/rivendell.pro b/rivendell.pro
index d271a38a..ee26cdb8 100644
--- a/rivendell.pro
+++ b/rivendell.pro
@@ -2,7 +2,7 @@
 #
 # The top level QMake project file for Rivendell
 #
-# (C) Copyright 2003-2004,2016 Fred Gleason <fredg@paravelsystems.com>
+# (C) Copyright 2003-2021 Fred Gleason <fredg@paravelsystems.com>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License version 2 as
@@ -21,7 +21,6 @@ TEMPLATE = subdirs
 
 SUBDIRS += lib
 SUBDIRS += utils
-#SUBDIRS += ripcd
 SUBDIRS += rdlogedit
 SUBDIRS += rdlogmanager
 
diff --git a/utils/rdgpimon/Makefile.am b/utils/rdgpimon/Makefile.am
index 6a459df8..7048d3c1 100644
--- a/utils/rdgpimon/Makefile.am
+++ b/utils/rdgpimon/Makefile.am
@@ -20,8 +20,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -29,15 +27,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rdgpimon_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../../helpers/rdi18n_helper.sh --install rdgpimon $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rdgpimon_*.qm
+	../../helpers/rdi18n_helper.sh --uninstall rdgpimon $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rdgpimon.pro
-	$(LRELEASE) rdgpimon.pro
+	../../helpers/rdi18n_helper.sh --update rdgpimon $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rdgpimon
 
diff --git a/utils/rmlsend/Makefile.am b/utils/rmlsend/Makefile.am
index 15e0d289..1f975cb9 100644
--- a/utils/rmlsend/Makefile.am
+++ b/utils/rmlsend/Makefile.am
@@ -20,8 +20,6 @@
 AM_CPPFLAGS = -Wall -DPREFIX=\"$(prefix)\" -Wno-strict-aliasing -std=c++11 -fPIC -I$(top_srcdir)/lib @QT5_CFLAGS@ @MUSICBRAINZ_CFLAGS@
 LIBS = -L$(top_srcdir)/lib
 MOC = @QT_MOC@
-LUPDATE = @QT_LUPDATE@
-LRELEASE = @QT_LRELEASE@
 
 # The dependency for qt's Meta Object Compiler (moc)
 moc_%.cpp:	%.h
@@ -29,15 +27,13 @@ moc_%.cpp:	%.h
 
 # I18N Stuff
 install-exec-local:	
-	mkdir -p $(DESTDIR)$(prefix)/share/rivendell
-	cp rmlsend_*.qm $(DESTDIR)$(prefix)/share/rivendell
+	../../helpers/rdi18n_helper.sh --install rmlsend $(DESTDIR)$(prefix)/share/rivendell
 
 uninstall-local:	
-	rm -f $(DESTDIR)$(prefix)/share/rivendell/rmlsend_*.qm
+	../../helpers/rdi18n_helper.sh --uninstall rmlsend $(DESTDIR)$(prefix)/share/rivendell
 
 all:	
-	$(LUPDATE) rmlsend.pro
-	$(LRELEASE) rmlsend.pro
+	../../helpers/rdi18n_helper.sh --update rmlsend $(DESTDIR)$(prefix)/share/rivendell
 
 bin_PROGRAMS = rmlsend