diff --git a/.gitignore b/.gitignore
index 3dc032f..df1d39f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/cdi-api-1.0.SP4.tar.xz
+/1.1.tar.gz
diff --git a/cdi-api.spec b/cdi-api.spec
index 9698fd2..6e355f5 100644
--- a/cdi-api.spec
+++ b/cdi-api.spec
@@ -1,22 +1,17 @@
-%global namedreltag .SP4
+%global namedreltag .NOTHING
%global namedversion %{version}%{?namedreltag}
Name: cdi-api
-Version: 1.0
-Release: 9%{namedreltag}%{?dist}
+Version: 1.1
+Release: 1%{?dist}
Summary: CDI API
Group: Development/Libraries
License: ASL 2.0
URL: http://seamframework.org/Weld
-
-# svn export http://anonsvn.jboss.org/repos/weld/cdi-api/tags/1.0-SP4/ cdi-api-1.0.SP4
-# tar cafJ cdi-api-1.0.SP4.tar.xz cdi-api-1.0.SP4
-Source0: cdi-api-%{namedversion}.tar.xz
+Source0: https://github.com/cdi-spec/cdi/archive/%{version}.tar.gz
BuildArch: noarch
-BuildRequires: jpackage-utils
-BuildRequires: java-devel
BuildRequires: maven-local
BuildRequires: maven-compiler-plugin
BuildRequires: maven-install-plugin
@@ -31,57 +26,38 @@ BuildRequires: jboss-ejb-3.1-api
BuildRequires: geronimo-annotation
BuildRequires: geronimo-parent-poms
BuildRequires: weld-parent
-
-Requires: jpackage-utils
-Requires: java
-Requires: jboss-el-2.2-api
-Requires: jboss-interceptors-1.1-api
-Requires: jboss-ejb-3.1-api
-Requires: geronimo-annotation
+BuildRequires: maven-plugin-build-helper
%description
APIs for JSR-299: Contexts and Dependency Injection for Java EE
%package javadoc
Summary: Javadocs for %{name}
-Group: Documentation
-Requires: jpackage-utils
%description javadoc
This package contains the API documentation for %{name}.
%prep
-%setup -q -n cdi-api-%{namedversion}
+%setup -q -n cdi-%{version}
%build
-mvn-rpmbuild package javadoc:aggregate
+cd api
+%mvn_build
%install
-install -d -m 755 %{buildroot}%{_javadir}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/cdi-api-%{version}-SP4.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+cd api
+%mvn_install
-# DEPMAP
-%add_maven_depmap
+%files -f api/.mfiles
+%dir %{_javadir}/%{name}
-# APIDOCS
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f api/.mfiles-javadoc
%changelog
+* Thu Jul 04 2013 Marek Goldmann <mgoldman@redhat.com> - 1.1-1
+- Upstream release 1.1
+- New guidelines
+
* Sat Mar 02 2013 Mat Booth <fedora@matbooth.co.uk> - 1.0-9.SP4
- Add missing BR, fixes FTBFS rhbz #913916
diff --git a/sources b/sources
index cc20466..9b9f97a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c42d3c6d08023a2402324c0b0339c81 cdi-api-1.0.SP4.tar.xz
+392a5e82b2a8a4e2b913326fef91517a 1.1.tar.gz