diff --git a/julietaula-montserrat-fonts.spec b/julietaula-montserrat-fonts.spec
index 1a54361..44a7346 100644
--- a/julietaula-montserrat-fonts.spec
+++ b/julietaula-montserrat-fonts.spec
@@ -1,18 +1,22 @@
 %global fontname julietaula-montserrat
-%global fontconf 61-%{fontname}.conf
+%global fontconf 61-%{fontname}
+%global common_desc \
+A typeface created by Julieta Ulanovsky inspired by signs around the Montserrat area of Buenos Aires, Argentina
 
-Name:		julietaula-montserrat-fonts
+Name:		%{fontname}-fonts
 Version:	7.200
-Release:	3%{?dist}
+Release:	4%{?dist}
 # Override versioning to sync with upstream
 Epoch:		1
-Summary:	Sans-serif typeface created by Julieta Ulanovsky
+Summary:	Sans-serif typeface inspired from Montserrat area
 
 License:	OFL
 URL:		https://github.com/JulietaUla/Montserrat
 Source0:	%{url}/archive/Montserrat/v%{version}.tar.gz#/Montserrat-%{version}.tar.gz
 Source1:	%{name}-fontconfig.conf
-Source2:	%{fontname}.metainfo.xml
+Source2:	%{name}-alternates-fontconfig.conf
+Source3:	%{fontname}.metainfo.xml
+Source4:	%{fontname}-alternates.metainfo.xml
 
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
@@ -26,8 +30,35 @@ Obsoletes:	%{name} < 1:%{version}-%{release}
 
 
 %description
-A typeface created by Julieta Ulanovsky inspired by signs around
-the Montserrat area of Buenos Aires, Argentina
+%common_desc
+
+%package common
+Summary:  Common files for %{name}
+Requires: fontpackages-filesystem
+
+%description common
+%common_desc
+This package consists of files used by other %{name} packages.
+
+%package	-n %{fontname}
+Summary:        Base version of the Montserrat area inspired typeface
+Requires:       %{name}-common = %{version}-%{release}
+
+%description	-n %{fontname}
+%common_desc
+
+%_font_pkg -f %{fontconf}.conf Montserrat-*.otf
+%{_datadir}/metainfo/%{fontname}.metainfo.xml
+
+%package -n %{fontname}-alternates-fonts
+Summary:        A Montserrat area inspired typeface family alternate version
+Requires:       %{name}-common = %{version}-%{release}
+
+%description -n %{fontname}-alternates-fonts
+%common_desc
+
+%_font_pkg -n alternates -f %{fontconf}-alternates.conf MontserratAlternates-*.otf
+%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
 
 %prep
 %autosetup -c
@@ -36,32 +67,45 @@ the Montserrat area of Buenos Aires, Argentina
 
 
 %install
-install -Dpm 0644 Montserrat-%{version}/fonts/ttf/*.ttf -t %{buildroot}%{_fontdir}
 install -Dpm 0644 Montserrat-%{version}/fonts/otf/*.otf -t %{buildroot}%{_fontdir}
 
 install -m 0755 -d %{buildroot}%{_fontconfig_templatedir} \
 		%{buildroot}%{_fontconfig_confdir}
 
+# Install Montserrat fonts
 install -m 0644 -p %{SOURCE1} \
-		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}
-ln -s %{_fontconfig_templatedir}/%{fontconf} \
-      %{buildroot}%{_fontconfig_confdir}/%{fontconf}
+		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}.conf
+
+# Install MontserratAlternates fonts
+install -m 0644 -p %{SOURCE2} \
+		%{buildroot}%{_fontconfig_templatedir}/%{fontconf}-alternates.conf
 
+for fconf in %{fontconf}.conf \
+	     %{fontconf}-alternates.conf ; do
+	ln -s %{_fontconfig_templatedir}/$fconf \
+      		%{buildroot}%{_fontconfig_confdir}/$fconf
+done
+
+# Add AppStream metadata file, Repeat for every font family
 %if 0%{?fedora} >= 21
-install -Dm 0644 -p %{SOURCE2} \
+install -Dm 0644 -p %{SOURCE3} \
 		%{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml
+install -Dm 0644 -p %{SOURCE4} \
+		%{buildroot}%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
 
 %check
 appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}-alternates.metainfo.xml
 %endif
-%_font_pkg -f %{fontconf} *.ttf *.otf
-%if 0%{?fedora} >= 21
-%{_datadir}/metainfo/%{fontname}.metainfo.xml
-%endif
+
+%files common
 %license Montserrat-%{version}/OFL.txt
 %doc Montserrat-%{version}/README.md 
 
 %changelog
+* Sat Oct 20 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-4
+- Update spec file adhering to Fedora Fonts guideline rhbz#1628832
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:7.200-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/julietaula-montserrat.metainfo.xml b/julietaula-montserrat.metainfo.xml
index 202be4d..c3158b3 100644
--- a/julietaula-montserrat.metainfo.xml
+++ b/julietaula-montserrat.metainfo.xml
@@ -11,15 +11,6 @@
 <p>The letters that inspired this project have work, dedication, care, color, contrast, light and life, day and night! These are the types that make the city look so beautiful.</p>
   </description>
   <provides>
-  	<font file="MontserratAlternates-Black.otf">Montserrat Alternates Black</font>
-	<font file="MontserratAlternates-Bold.otf">Montserrat Alternates Bold</font>
-	<font file="MontserratAlternates-ExtraBold.otf">Montserrat Alternates Extra Bold</font>
-	<font file="MontserratAlternates-Light.otf">Montserrat Alternates Light</font>
-	<font file="MontserratAlternates-Medium.otf">Montserrat Alternates Medium</font>
-	<font file="MontserratAlternates-Regular.otf">Montserrat Alternates Regular</font>
-	<font file="MontserratAlternates-SemiBold.otf">Montserrat Alternates Semi Bold</font>
-	<font file="MontserratAlternates-Thin.otf">Montserrat Alternates Thin</font>
-	<font file="MontserratAlternates-UltraLight.otf">Montserrat Alternates Ultra Light</font>
 	<font file="Montserrat-Black.otf">Montserrat Black</font>
 	<font file="Montserrat-Bold.otf">Montserrat Bold</font>
 	<font file="Montserrat-ExtraBold.otf">Montserrat Extra Bold</font>