diff --git a/Modules.changes b/Modules.changes
index 4d0785f..dd02483 100644
--- a/Modules.changes
+++ b/Modules.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 17 11:13:53 UTC 2018 - boris@steki.net
+
+- rolled back change from /usr/share/Modules (package name) to old 
+  expected behavior /usr/share/modules
+- fixed redhat/fedora builds 
+
 -------------------------------------------------------------------
 Mon Apr 16 19:24:51 UTC 2018 - boris@steki.net
 
diff --git a/Modules.spec b/Modules.spec
index 6054613..c487aa5 100644
--- a/Modules.spec
+++ b/Modules.spec
@@ -41,8 +41,9 @@ Obsoletes:      environment-modules < %{version}
 Recommends:     %{name}-doc
 %endif
 
-%if 0%{?redhat_version}
+%if 0%{?rhel_version} || 0%{?fedora_version}
 BuildRequires:  perl(Digest::MD5)
+BuildRequires:  perl(Exporter)
 %endif
 
 %description
@@ -59,7 +60,8 @@ modules environment is common on SGI/Crays and many workstation farms.
 
 %package doc
 Summary:        Documentation for Change environment at runtime
-Group:          System/Management
+Group:          Documentation/Other
+BuildArch:      noarch
 
 %description doc
 The Modules package provides for dynamic modification of a user's
@@ -86,7 +88,7 @@ CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DUSE_INTERP_RESULT -DUSE_INTERP_ERR
                 --libexecdir="%{_prefix}/%_lib/%{name}/" \
                 --prefix="%_prefix" \
                 --with-version-path="%_datadir/%{name}" \
-                --modulefilesdir="%{_datadir}/%{name}/modulefiles" \
+                --modulefilesdir="%{_datadir}/modules" \
 		--mandir=%{_mandir} \
                 --with-etc-path="%_sysconfdir" \
                 --with-skel-path="%_sysconfdir/skel" \
@@ -106,7 +108,7 @@ mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
 %doc doc_dir/README
 %dir %{_libdir}/%{name}
 %dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/modulefiles
+%dir %{_datadir}/modules
 %{_bindir}/add.modules
 %{_bindir}/envml
 %{_bindir}/mkroot
@@ -114,7 +116,7 @@ mv $RPM_BUILD_ROOT/usr/share/doc doc_dir
 %{_datadir}/%{name}/init
 %{_libdir}/%{name}/modulecmd-compat
 %{_libdir}/%{name}/modulecmd.tcl
-%{_datadir}/%{name}/modulefiles/*
+%{_datadir}/modules/*
 %{_mandir}/man1/module-compat.1*
 %{_mandir}/man1/module.1*
 %{_mandir}/man4/modulefile-compat.4*