diff --git a/ogg123/Makefile.am b/ogg123/Makefile.am
index d9e4047df712753e465b4c4c940913e0896347de..0e3fe2e1577bc42063c44ba25ef3483cc808595d 100644
--- a/ogg123/Makefile.am
+++ b/ogg123/Makefile.am
@@ -29,11 +29,13 @@ ogg123_SOURCES = audio.c buffer.c callbacks.c \
                 cfgfile_options.h cmdline_options.h \
                 format.h ogg123.h playlist.h status.h \
                 transport.h vorbis_comments.h
-EXTRA_ogg123_SOURCES = flac_format.c easyflac.c easyflac.h speex_format.c
 
 man_MANS = ogg123.1
 doc_DATA = ogg123rc-example
 
+EXTRA_ogg123_SOURCES = flac_format.c easyflac.c easyflac.h speex_format.c \
+                $(man_MANS) $(doc_DATA)
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
 
diff --git a/oggdec/Makefile.am b/oggdec/Makefile.am
index 422849b3387fce7b183425befcec1c8253b491ff..0ba540ed6be138472b94376e4d918351848dd180 100644
--- a/oggdec/Makefile.am
+++ b/oggdec/Makefile.am
@@ -21,6 +21,7 @@ oggdec_SOURCES = $(oggdecsources)
 man_MANS = $(mans)
 mandir = @MANDIR@
 
+EXTRA_oggdec_SOURCES = $(man_MANS)
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/oggenc/man/Makefile.am b/oggenc/man/Makefile.am
index 5ece6f259e1b1b0203c4c174ab7b71175a5b7c12..b55d2559079776643b5db9cabee75d357d9ae001 100644
--- a/oggenc/man/Makefile.am
+++ b/oggenc/man/Makefile.am
@@ -5,4 +5,4 @@ AUTOMAKE_OPTIONS = foreign
 mans = oggenc.1
 
 mandir = @MANDIR@
-man_MANS = $(mans)
+dist_man_MANS = $(mans)
diff --git a/ogginfo/Makefile.am b/ogginfo/Makefile.am
index 7bb4ae6371ad47ca165c36fc041ed98a77c5e4f3..ef411e413031b688563a8fa7804819177035f79c 100644
--- a/ogginfo/Makefile.am
+++ b/ogginfo/Makefile.am
@@ -19,7 +19,7 @@ ogginfo_LDADD = @SHARE_LIBS@ @VORBIS_LIBS@ @OGG_LIBS@ @LIBICONV@ @I18N_LIBS@
 ogginfo_DEPENDENCIES = @SHARE_LIBS@
 
 ogginfo_SOURCES = $(ogginfosources)
-
+EXTRA_ogginfo_SOURCES = $(man_MANS) 
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/vcut/Makefile.am b/vcut/Makefile.am
index bd87ecf601c8ba09463bc6ff8db45ca70325353f..34ff53418c2ed483e1143ed2c0c2476e18dd5b3e 100644
--- a/vcut/Makefile.am
+++ b/vcut/Makefile.am
@@ -18,6 +18,7 @@ INCLUDES = @OGG_CFLAGS@ @VORBIS_CFLAGS@ @SHARE_CFLAGS@ @I18N_CFLAGS@
 vcut_LDADD = @VORBIS_LIBS@ @OGG_LIBS@ @I18N_LIBS@
 
 vcut_SOURCES = $(vcutsources)
+EXTRA_vcut_SOURCES = $(man_MANS)
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/vorbiscomment/Makefile.am b/vorbiscomment/Makefile.am
index c167d92fe77a324d13ed5817820e9b8f698c83cd..452891a36ce34c2be82cd24f39b3b4c3030f576d 100644
--- a/vorbiscomment/Makefile.am
+++ b/vorbiscomment/Makefile.am
@@ -20,6 +20,8 @@ vorbiscomment_DEPENDENCIES = @SHARE_LIBS@
 
 vorbiscomment_SOURCES = $(vorbiscommentsources)
 
+EXTRA_vorbiscomment_SOURCES = $(man_MANS)
+
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"