diff --git a/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/javax.imageio.spi.ImageReaderSpi b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/javax.imageio.spi.ImageReaderSpi
new file mode 100644
index 0000000..86d38d4
--- /dev/null
+++ b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/javax.imageio.spi.ImageReaderSpi
@@ -0,0 +1,2 @@
+org.monte.media.pbm.PBMImageReaderSpi
+org.monte.media.ilbm.ILBMImageReaderSpi
diff --git a/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.CodecSpi b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.CodecSpi
new file mode 100644
index 0000000..3f27e39
--- /dev/null
+++ b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.CodecSpi
@@ -0,0 +1 @@
+org.monte.media.amigabitmap.codec.video.AmigaBitmapCodecSpi
diff --git a/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.MovieWriterSpi b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.MovieWriterSpi
new file mode 100644
index 0000000..4a75f29
--- /dev/null
+++ b/org.monte.media.amigaatari/src/main/java/org.monte.media.amigaatari/META-INF/services/org.monte.media.av.MovieWriterSpi
@@ -0,0 +1 @@
+org.monte.media.anim.ANIMWriterSpi
diff --git a/org.monte.media/src/main/java/org.monte.media/META-INF/services/javax.imageio.spi.ImageReaderSpi b/org.monte.media/src/main/java/org.monte.media/META-INF/services/javax.imageio.spi.ImageReaderSpi
new file mode 100644
index 0000000..3c05b02
--- /dev/null
+++ b/org.monte.media/src/main/java/org.monte.media/META-INF/services/javax.imageio.spi.ImageReaderSpi
@@ -0,0 +1,3 @@
+org.monte.media.pgm.PGMImageReaderSpi
+org.monte.media.jpeg.CMYKJPEGImageReaderSpi
+org.monte.media.mpo.MPOImageReaderSpi
diff --git a/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.CodecSpi b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.CodecSpi
new file mode 100644
index 0000000..c6892e0
--- /dev/null
+++ b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.CodecSpi
@@ -0,0 +1,10 @@
+org.monte.media.av.codec.video.JPEGCodecSpi
+org.monte.media.av.codec.video.PNGCodecSpi
+org.monte.media.av.codec.video.TechSmithCodecSpi
+org.monte.media.quicktime.codec.audio.QuickTimePCMAudioCodecSpi
+org.monte.media.quicktime.codec.video.AnimationCodecSpi
+org.monte.media.quicktime.codec.video.RawCodecSpi
+org.monte.media.avi.codec.audio.AVIPCMAudioCodecSpi
+org.monte.media.avi.codec.video.DIBCodecSpi
+org.monte.media.avi.codec.video.RunLengthCodecSpi
+org.monte.media.avi.codec.video.ZMBVCodecSpi
diff --git a/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieReaderSpi b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieReaderSpi
new file mode 100644
index 0000000..3ceddd9
--- /dev/null
+++ b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieReaderSpi
@@ -0,0 +1,2 @@
+org.monte.media.avi.AVIReaderSpi
+org.monte.media.quicktime.QuickTimeReaderSpi
diff --git a/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieWriterSpi b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieWriterSpi
new file mode 100644
index 0000000..38474e4
--- /dev/null
+++ b/org.monte.media/src/main/java/org.monte.media/META-INF/services/org.monte.media.av.MovieWriterSpi
@@ -0,0 +1,2 @@
+org.monte.media.avi.AVIWriterSpi
+org.monte.media.quicktime.QuickTimeWriterSpi