diff --git a/hyphen-pa.spec b/hyphen-pa.spec
index 0e98c77..a078bf9 100644
--- a/hyphen-pa.spec
+++ b/hyphen-pa.spec
@@ -1,11 +1,9 @@
-%global upstreamid 20111229
-%global upstream_version 0.7.0
-
 Name: hyphen-pa
 Summary: Punjabi hyphenation rules
-Version: 0.%{upstreamid}
-Release: 2%{?dist}
-Source: http://download.savannah.gnu.org/releases/smc/hyphenation/patterns/%{name}-%{upstream_version}.tar.bz2
+Epoch: 1
+Version: 0.7.0
+Release: 1%{?dist}
+Source: http://download.savannah.gnu.org/releases/smc/hyphenation/patterns/%{name}-%{version}.tar.bz2
 Group: Applications/Text
 URL: http://wiki.smc.org.in
 License: LGPLv3+
@@ -16,15 +14,15 @@ Requires: hyphen
 Punjabi hyphenation rules.
 
 %prep
-%setup -q -n %{name}-%{upstream_version} 
+%setup -q
 
 %build
 
 %install
-mkdir -p $RPM_BUILD_ROOT/%{_datadir}/hyphen
-install -m644 -p *.dic $RPM_BUILD_ROOT/%{_datadir}/hyphen
+mkdir -p %{buildroot}/%{_datadir}/hyphen
+install -m644 -p *.dic %{buildroot}/%{_datadir}/hyphen
 
-pushd $RPM_BUILD_ROOT/%{_datadir}/hyphen/
+pushd %{buildroot}/%{_datadir}/hyphen/
 pa_IN_aliases="pa_PK"
 for lang in $pa_IN_aliases; do
         ln -s hyph_pa_IN.dic hyph_$lang.dic
@@ -36,6 +34,9 @@ popd
 %{_datadir}/hyphen/*
 
 %changelog
+* Tue Nov 27 2012 Parag <pnemade AT redhat DOT com> - 0.7.0-1
+- Resolves:rh#880294- package does not follow naming guidelines
+
 * Wed Nov 21 2012 Parag <pnemade AT redhat DOT com> - 0.20111229-2
 - Add %%doc files