diff --git a/libavformat/Makefile b/libavformat/Makefile
index bcdf3f5c8b..538883d75b 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -225,8 +225,8 @@ OBJS-$(CONFIG_SDP_DEMUXER)               += rtsp.o        \
                                             rtpdec_asf.o  \
                                             rtpdec_h263.o \
                                             rtpdec_h264.o \
-                                            rtpdec_theora.o \
-                                            rtpdec_vorbis.o
+                                            rtpdec_vorbis.o \
+                                            rtpdec_xiph.o
 OBJS-$(CONFIG_SEGAFILM_DEMUXER)          += segafilm.o
 OBJS-$(CONFIG_SHORTEN_DEMUXER)           += raw.o id3v2.o
 OBJS-$(CONFIG_SIFF_DEMUXER)              += siff.o
diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index e329ad291d..01822a8b4d 100644
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -34,8 +34,7 @@
 #include "rtpdec_asf.h"
 #include "rtpdec_h263.h"
 #include "rtpdec_h264.h"
-#include "rtpdec_vorbis.h"
-#include "rtpdec_theora.h"
+#include "rtpdec_xiph.h"
 
 //#define DEBUG
 
diff --git a/libavformat/rtpdec_theora.c b/libavformat/rtpdec_xiph.c
similarity index 99%
rename from libavformat/rtpdec_theora.c
rename to libavformat/rtpdec_xiph.c
index 56a59e4e16..11d3c92abf 100644
--- a/libavformat/rtpdec_theora.c
+++ b/libavformat/rtpdec_xiph.c
@@ -32,7 +32,7 @@
 #include <assert.h>
 
 #include "rtpdec.h"
-#include "rtpdec_theora.h"
+#include "rtpdec_xiph.h"
 
 /**
  * RTP/Theora specific private data.
diff --git a/libavformat/rtpdec_theora.h b/libavformat/rtpdec_xiph.h
similarity index 100%
rename from libavformat/rtpdec_theora.h
rename to libavformat/rtpdec_xiph.h