diff --git a/configure b/configure
index 709ff5da366fcb9fccefcf2ff773e0be53726097..7882106cbee308fe07e6a093ae0893a95c3895a0 100755
--- a/configure
+++ b/configure
@@ -562,7 +562,8 @@ audio_muxer_deps_any="audio_oss audio_beos"
 dc1394_demuxer_deps="dc1394"
 dv1394_demuxer_deps="dv1394"
 gxf_muxer_deps="gpl"
-nut_muxer_deps="libnut"
+libnut_demuxer_deps="libnut"
+libnut_muxer_deps="libnut"
 ogg_muxer_deps="libogg"
 redir_demuxer_deps="network"
 rtp_muxer_deps="network"
diff --git a/libavformat/Makefile b/libavformat/Makefile
index 3f338c7647980de9992d991b22c3580780b2665f..2c2316daa2fc55d6313d833396be30d70a2e8ed3 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -165,13 +165,11 @@ OBJS+= udp.o tcp.o http.o rtsp.o rtp.o rtpproto.o mpegts.o base64.o rtp_h264.o
 endif
 endif
 
-ifeq ($(CONFIG_LIBNUT),yes)
-OBJS-$(CONFIG_NUT_DEMUXER)               += libnut.o riff.o
-OBJS-$(CONFIG_NUT_MUXER)                 += libnut.o riff.o
-else
+OBJS-$(CONFIG_LIBNUT_DEMUXER)            += libnut.o riff.o
+OBJS-$(CONFIG_LIBNUT_MUXER)              += libnut.o riff.o
+
 OBJS-$(CONFIG_NUT_DEMUXER)               += nutdec.o riff.o
 #OBJS-$(CONFIG_NUT_MUXER)                 += nutenc.o riff.o
-endif
 
 NAME=avformat
 ifeq ($(BUILD_SHARED),yes)
diff --git a/libavformat/allformats.c b/libavformat/allformats.c
index f5b2acecf78859464698bed3893fddacf1b2a079..2dcecf5b9dc70e469a0bb4135400ac6e787084d6 100644
--- a/libavformat/allformats.c
+++ b/libavformat/allformats.c
@@ -83,6 +83,8 @@ void av_register_all(void)
     REGISTER_MUXDEMUX(IMAGE2PIPE, image2pipe);
     REGISTER_DEMUXER (INGENIENT, ingenient);
     REGISTER_DEMUXER (IPMOVIE, ipmovie);
+    if (!ENABLE_NUT_DEMUXER) REGISTER_DEMUXER (LIBNUT, libnut);
+    REGISTER_MUXER   (LIBNUT, libnut);
     REGISTER_MUXDEMUX(M4V, m4v);
     REGISTER_DEMUXER (MATROSKA, matroska);
     REGISTER_MUXDEMUX(MJPEG, mjpeg);
@@ -109,7 +111,6 @@ void av_register_all(void)
     REGISTER_DEMUXER (NSV, nsv);
     REGISTER_MUXER   (NULL, null);
     REGISTER_DEMUXER (NUT, nut);
-    REGISTER_MUXER   (NUT, nut);
     REGISTER_DEMUXER (NUV, nuv);
     REGISTER_DEMUXER (OGG, ogg);
     REGISTER_MUXER   (OGG, ogg);
diff --git a/libavformat/allformats.h b/libavformat/allformats.h
index 8aff3537b69addcf7b13d61042413cdba65b2519..9e0e13e8a31ea58be293bed0586e97f72c0b4a2c 100644
--- a/libavformat/allformats.h
+++ b/libavformat/allformats.h
@@ -69,6 +69,8 @@ extern AVInputFormat imagepipe_demuxer;
 extern AVOutputFormat image_muxer;
 extern AVOutputFormat imagepipe_muxer;
 extern AVInputFormat ipmovie_demuxer;
+extern AVInputFormat libnut_demuxer;
+extern AVOutputFormat libnut_muxer;
 extern AVInputFormat matroska_demuxer;
 extern AVInputFormat mm_demuxer;
 extern AVInputFormat mmf_demuxer;
@@ -96,7 +98,6 @@ extern AVInputFormat mtv_demuxer;
 extern AVInputFormat mxf_demuxer;
 extern AVInputFormat nsv_demuxer;
 extern AVInputFormat nut_demuxer;
-extern AVOutputFormat nut_muxer;
 extern AVInputFormat nuv_demuxer;
 extern AVInputFormat ogg_demuxer;
 extern AVOutputFormat ogg_muxer;
diff --git a/libavformat/libnut.c b/libavformat/libnut.c
index d224d8d5c5b2783acd11f4fd635d3cc9ea7ac4c7..79a6fcaef3fca42cfff2d243bcd8a58fce5fd3f6 100644
--- a/libavformat/libnut.c
+++ b/libavformat/libnut.c
@@ -123,7 +123,7 @@ static int nut_write_trailer(AVFormatContext * avf) {
     return 0;
 }
 
-AVOutputFormat nut_muxer = {
+AVOutputFormat libnut_muxer = {
     "nut",
     "nut format",
     "video/x-nut",
@@ -270,7 +270,7 @@ static int nut_read_close(AVFormatContext *s) {
     return 0;
 }
 
-AVInputFormat nut_demuxer = {
+AVInputFormat libnut_demuxer = {
     "nut",
     "nut format",
     sizeof(NUTContext),