diff --git a/Makefile b/Makefile
index 76f9fdcf61..e9c81a687c 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ MANDIR = ${prefix}/man
 INSTALL = install
 
 SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c spudec.c playtree.c playtreeparser.c asxparser.c qtsmc.c ducktm1.c roqav.c qtrpza.c
-SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c
+SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c libvo/osd.c me-opt-reg.c
 SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c vobsub.c mp-opt-reg.c
 
 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
diff --git a/me-opt-reg.c b/me-opt-reg.c
new file mode 100644
index 0000000000..7b0c6012e8
--- /dev/null
+++ b/me-opt-reg.c
@@ -0,0 +1,14 @@
+
+#include "config.h"
+#include <stdlib.h>
+#include <stdio.h>
+#include "cfgparser.h"
+
+extern void libmpdemux_register_options(m_config_t* cfg);
+
+void
+me_register_options(m_config_t* cfg) {
+
+  libmpdemux_register_options(cfg);
+
+}
diff --git a/mencoder.c b/mencoder.c
index 5073cc8bff..3c36fb3609 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -341,6 +341,8 @@ int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){
     return size;
 }
 
+extern void me_register_options(m_config_t* cfg);
+
 //---------------------------------------------------------------------------
 
 static int eof=0;
@@ -443,7 +445,7 @@ divx4_param.rc_reaction_ratio  = 20;
   playtree = play_tree_new();
   mconfig = m_config_new(playtree);
   m_config_register_options(mconfig,mencoder_opts);
-  // TODO : add something to let modules register their options
+  me_register_options(mconfig);
   parse_cfgfiles(mconfig);
 
   if(m_config_parse_command_line(mconfig, argc, argv, envp) < 0) mencoder_exit(1, "error parsing cmdline");