diff --git a/.gitignore b/.gitignore
index d284c8d..5716ff3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /jboss-logging-3.0.1.GA.tar.xz
 /jboss-logging-3.1.0.CR1.tar.xz
+/jboss-logging-3.1.0.GA.tar.xz
diff --git a/jboss-logging.spec b/jboss-logging.spec
index 3a1943a..102dae0 100644
--- a/jboss-logging.spec
+++ b/jboss-logging.spec
@@ -1,16 +1,16 @@
-%global namedreltag .CR1
+%global namedreltag .GA
 %global namedversion %{version}%{?namedreltag}
 
 Name:             jboss-logging
 Version:          3.1.0
-Release:          0.2%{namedreltag}%{?dist}
+Release:          1%{?dist}
 Summary:          The JBoss Logging Framework
 Group:            Development/Libraries
 License:          LGPLv2+
 URL:              https://github.com/jboss-logging/jboss-logging
 
 # git clone git://github.com/jboss-logging/jboss-logging.git
-# cd jboss-logging/ && git archive --format=tar --prefix=jboss-logging-3.1.0.CR1/ 3.1.0.CR1 | xz > jboss-logging-3.1.0.CR1.tar.xz
+# cd jboss-logging/ && git archive --format=tar --prefix=jboss-logging-3.1.0.GA/ 3.1.0.GA | xz > jboss-logging-3.1.0.GA.tar.xz
 Source0:          %{name}-%{namedversion}.tar.xz
 
 BuildArch:        noarch
@@ -58,8 +58,8 @@ mvn-rpmbuild install javadoc:aggregate
 
 %install
 # JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/jboss
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/jboss/%{name}.jar
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # APIDOCS
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -67,21 +67,24 @@ cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 #POM
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.jboss-%{name}.pom
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # DEPMAP
-%add_maven_depmap JPP.jboss-%{name}.pom jboss/%{name}.jar
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 %{_javadir}/*
-%doc
 
 %files javadoc
 %{_javadocdir}/%{name}
 
 %changelog
+* Sun Feb 26 2012 Marek Goldmann <mgoldman@redhat.com> 3.1.0-1
+- Upstream release 3.1.0.GA
+- Relocated jars to _javadir
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.0-0.2.CR1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 5740c28..ac03f86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f555af510095415a6560456252d714  jboss-logging-3.1.0.CR1.tar.xz
+ed189d29d2d08d8bd8a3e66b101af7fb  jboss-logging-3.1.0.GA.tar.xz