diff --git a/Makefile.am b/Makefile.am
index 0ca65adb8..84d128227 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -578,6 +578,19 @@ libpcm_a_SOURCES += \
 	src/pcm/SoxrResampler.cxx src/pcm/SoxrResampler.hxx
 endif
 
+# Xiph codec support library
+
+if HAVE_XIPH
+
+noinst_LIBRARIES += libxiph.a
+
+libxiph_a_SOURCES = \
+	src/lib/xiph/XiphTags.cxx src/lib/xiph/XiphTags.hxx
+
+XIPH_LIBS = libxiph.a
+
+endif
+
 # File system library
 
 FS_LIBS = libfs.a
@@ -925,6 +938,7 @@ libdecoder_a_CPPFLAGS = $(AM_CPPFLAGS) \
 
 DECODER_LIBS = \
 	libdecoder.a \
+	$(XIPH_LIBS) \
 	$(VORBIS_LIBS) $(TREMOR_LIBS) \
 	$(FLAC_LIBS) \
 	$(SNDFILE_LIBS) \
@@ -1005,7 +1019,6 @@ endif
 
 if HAVE_XIPH
 libdecoder_a_SOURCES += \
-	src/decoder/plugins/XiphTags.cxx src/decoder/plugins/XiphTags.hxx \
 	src/decoder/plugins/OggCodec.cxx src/decoder/plugins/OggCodec.hxx
 endif
 
diff --git a/src/decoder/plugins/FlacMetadata.cxx b/src/decoder/plugins/FlacMetadata.cxx
index 77501ebc9..6710af966 100644
--- a/src/decoder/plugins/FlacMetadata.cxx
+++ b/src/decoder/plugins/FlacMetadata.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "FlacMetadata.hxx"
-#include "XiphTags.hxx"
+#include "lib/xiph/XiphTags.hxx"
 #include "MixRampInfo.hxx"
 #include "tag/TagHandler.hxx"
 #include "tag/TagTable.hxx"
diff --git a/src/decoder/plugins/OpusTags.cxx b/src/decoder/plugins/OpusTags.cxx
index b25abae82..db7fa571a 100644
--- a/src/decoder/plugins/OpusTags.cxx
+++ b/src/decoder/plugins/OpusTags.cxx
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "OpusTags.hxx"
 #include "OpusReader.hxx"
-#include "XiphTags.hxx"
+#include "lib/xiph/XiphTags.hxx"
 #include "tag/TagHandler.hxx"
 #include "tag/Tag.hxx"
 #include "ReplayGainInfo.hxx"
diff --git a/src/decoder/plugins/VorbisComments.cxx b/src/decoder/plugins/VorbisComments.cxx
index 4f0e84893..72e8dbae1 100644
--- a/src/decoder/plugins/VorbisComments.cxx
+++ b/src/decoder/plugins/VorbisComments.cxx
@@ -19,7 +19,7 @@
 
 #include "config.h"
 #include "VorbisComments.hxx"
-#include "XiphTags.hxx"
+#include "lib/xiph/XiphTags.hxx"
 #include "tag/TagTable.hxx"
 #include "tag/TagHandler.hxx"
 #include "tag/TagBuilder.hxx"
diff --git a/src/decoder/plugins/XiphTags.cxx b/src/lib/xiph/XiphTags.cxx
similarity index 100%
rename from src/decoder/plugins/XiphTags.cxx
rename to src/lib/xiph/XiphTags.cxx
diff --git a/src/decoder/plugins/XiphTags.hxx b/src/lib/xiph/XiphTags.hxx
similarity index 100%
rename from src/decoder/plugins/XiphTags.hxx
rename to src/lib/xiph/XiphTags.hxx