diff --git a/Makefile.am b/Makefile.am
index 02d58afbf..67a869752 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,8 +130,6 @@ pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR)
 
 install-data-local:
 	@$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm
-	@$(INSTALL_DATA) file/magic $(DESTDIR)$(pkglibdir)/magic
-	@$(INSTALL_DATA) file/magic.mgc $(DESTDIR)$(pkglibdir)/magic.mgc
 	@rm -f $(DESTDIR)$(libdir)/rpmrc
 	@@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc
 	@rm -f $(DESTDIR)$(libdir)/rpmpopt
diff --git a/build/poptBT.c b/build/poptBT.c
index c651a09c5..2a1554cba 100644
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -1,5 +1,5 @@
 /** \ingroup rpmcli
- * \file lib/poptBT.c
+ * \file build/poptBT.c
  *  Popt tables for build modes.
  */
 
diff --git a/rpm.spec.in b/rpm.spec.in
index a10b36f3d..65722c651 100644
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -192,7 +192,7 @@ fi
 #  rm -rf .%{__prefix}/lib/${f}*
 # done
 # rm -f .%{__prefix}/share/man/man1/file.1*
-  rm -f .%{__prefix}/share/magic*
+# rm -f .%{__prefix}/share/magic*
 }
 
 %clean
@@ -395,6 +395,8 @@ exit 0
 %rpmattr	%{__prefix}/lib/rpm/javadeps
 %rpmattr	%{__prefix}/lib/rpm/magic
 %rpmattr	%{__prefix}/lib/rpm/magic.mgc
+%rpmattr	%{__prefix}/lib/rpm/magic.mime
+%rpmattr	%{__prefix}/lib/rpm/magic.mime.mgc
 %rpmattr	%{__prefix}/lib/rpm/magic.prov
 %rpmattr	%{__prefix}/lib/rpm/magic.req
 %rpmattr	%{__prefix}/lib/rpm/perl.prov
diff --git a/rpmdb/header.c b/rpmdb/header.c
index 2cf199764..1f4464fc1 100644
--- a/rpmdb/header.c
+++ b/rpmdb/header.c
@@ -1,5 +1,5 @@
 /** \ingroup header
- * \file lib/header.c
+ * \file rpmdb/header.c
  */
 
 /* RPM - Copyright (C) 1995-2002 Red Hat Software */
diff --git a/rpmdb/header.h b/rpmdb/header.h
index 625b9abda..1abdbc90c 100644
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -2,7 +2,7 @@
 #define H_HEADER
 
 /** \ingroup header
- * \file lib/header.h
+ * \file rpmdb/header.h
  *
  * An rpm header carries all information about a package. A header is
  * a collection of data elements called tags. Each tag has a data type,
diff --git a/rpmdb/header_internal.c b/rpmdb/header_internal.c
index cc29887c3..e2e4b6208 100644
--- a/rpmdb/header_internal.c
+++ b/rpmdb/header_internal.c
@@ -1,6 +1,6 @@
 /*@-sizeoftype@*/
 /** \ingroup header
- * \file lib/header_internal.c
+ * \file rpmdb/header_internal.c
  */
 
 #include "system.h"
diff --git a/rpmdb/header_internal.h b/rpmdb/header_internal.h
index de79b0901..f26be7f2c 100644
--- a/rpmdb/header_internal.h
+++ b/rpmdb/header_internal.h
@@ -2,7 +2,7 @@
 #define H_HEADER_INTERNAL
 
 /** \ingroup header
- * \file lib/header_internal.h
+ * \file rpmdb/header_internal.h
  */
 
 #include <header.h>
diff --git a/rpmio/stubs.c b/rpmio/stubs.c
index 188090317..208fc6d67 100644
--- a/rpmio/stubs.c
+++ b/rpmio/stubs.c
@@ -1,5 +1,5 @@
 /**
- * \file lib/stubs.c
+ * \file rpmio/stubs.c
  */
 
 /* XXX Portable shared libraries require rpmlib to contain these functions. */