diff --git a/.gitignore b/.gitignore
index 29e1350..bb90de7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 /Montserrat-b0153c845dc0835915d97facd61367d71710e99c.zip
+<<<<<<< HEAD
+=======
+/Montserrat-6.002.tar.gz
+>>>>>>> master
diff --git a/clog b/clog
index c1ffa5f..2782f3a 100644
--- a/clog
+++ b/clog
@@ -1,2 +1,2 @@
-Improved appstream file with fonts list
-
+Use Epoch to sync version with upstream
+Latest stable upstream release
diff --git a/julietaula-montserrat-fonts.spec b/julietaula-montserrat-fonts.spec
index 6fd8514..140ef6f 100644
--- a/julietaula-montserrat-fonts.spec
+++ b/julietaula-montserrat-fonts.spec
@@ -1,24 +1,18 @@
 %global fontname julietaula-montserrat
 %global fontconf 61-%{fontname}.conf
-%global commit b0153c845dc0835915d97facd61367d71710e99c
-%global commitdate 20151221
-#%%global shortcommit %%(c=%%{commit}; echo ${c:0:7})
-#%%global gitversion .git%%{commitdate}.%%{shortcommit}
-
-#global archivename %%{name}-%%{version}
 
 Name:		julietaula-montserrat-fonts
-Version:	%{commitdate}
-Release:	5%{?dist}
+Version:	6.002
+Release:	1%{?dist}
+# Override versioning to sync with upstream
+Epoch:		1
 Summary:	Sans-serif typeface created by Julieta Ulanovsky
 
 License:	OFL
-URL:		https://github.com/JulietaUla/Montserrat/
-Source0:	%{url}/archive/%{commit}/Montserrat-%{commit}.zip
+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
-Source3:	LICENSE.txt
-
 
 BuildArch:	noarch
 BuildRequires:	fontpackages-devel
@@ -27,21 +21,23 @@ BuildRequires:	libappstream-glib
 %endif
 Requires:	fontpackages-filesystem
 
+Provides:	%{name} = 1:%{version}-%{release}
+Obsoletes:	%{name} <= 1:%{version}-%{release}
+
+
 %description
-A typeface created by Julieta Ulanovsky inspired by signs around 
+A typeface created by Julieta Ulanovsky inspired by signs around
 the Montserrat area of Buenos Aires, Argentina
 
 %prep
-%setup -q -c
-cp -p %{SOURCE3} .
+%autosetup -c
 
 %build
 
 
 %install
-install -m 0755 -d %{buildroot}%{_fontdir}
-install -m 0644 -p Montserrat-%{commit}/ttf/*.ttf %{buildroot}%{_fontdir}
-install -m 0644 -p Montserrat-%{commit}/otf/*.otf %{buildroot}%{_fontdir}
+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}
@@ -53,30 +49,35 @@ ln -s %{_fontconfig_templatedir}/%{fontconf} \
 
 %if 0%{?fedora} >= 21
 install -Dm 0644 -p %{SOURCE2} \
-		%{buildroot}%{_datadir}/appdata/%{fontname}.metainfo.xml
+		%{buildroot}%{_datadir}/metainfo/%{fontname}.metainfo.xml
 
 %check
-appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{fontname}.metainfo.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{fontname}.metainfo.xml
 %endif
 %_font_pkg -f %{fontconf} *.ttf *.otf
 %if 0%{?fedora} >= 21
-%{_datadir}/appdata/%{fontname}.metainfo.xml
+%{_datadir}/metainfo/%{fontname}.metainfo.xml
 %endif
-%license LICENSE.txt
+%license Montserrat-%{version}/OFL.txt
+%doc Montserrat-%{version}/README.md 
 
 %changelog
-* Wed Apr 20 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 20151221-5
+* Mon May 15 2017 Luya Tshimbalanga <luya@fedoraproject.org> - 1:6.002-1
+- Use Epoch to sync version with upstream
+- Latest stable upstream release
+
+* Wed Apr 20 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 0:20151221-5
 - Improved appstream file with fonts list
 
-* Sun Mar 27 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 20151221-4
+* Sun Mar 27 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 0:20151221-4
 - Fixed compatibility issue with Fedora 22 and EPEL7 less
 
-* Fri Mar 25 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 20151221-3
+* Fri Mar 25 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 0:20151221-3
 - Switched doc section to license
 - Deleted oft and ttf subdirectories
 
-* Fri Mar 25 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 20151221-2
+* Fri Mar 25 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 0:20151221-2
 - Moved appstream-util to check section
 
-* Thu Mar 24 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 20151221-1
+* Thu Mar 24 2016 Luya Tshimbalanga <luya@fedoraproject.org> - 0:20151221-1
 - Initial build
diff --git a/sources b/sources
index 80d728d..b14ecd7 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
+<<<<<<< HEAD
 4dce41fb934d3bdbf3fed385c08a48dc  Montserrat-b0153c845dc0835915d97facd61367d71710e99c.zip
+=======
+SHA512 (Montserrat-6.002.tar.gz) = 116fd0bef786c1b188d9855658fc9237ae327d32decb6c6f182127d9e37523f48e3aa70d859ac45b2031f0e7e872e9eb71d002c45b829628f0ef43e62c17fd57
+>>>>>>> master