diff --git a/.gitignore b/.gitignore
index 127407e..8e9eaf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /noarch
 /.build-*.log
 /*.src.rpm
+/osgi.annotation-7.0.0.jar
+/osgi.annotation-7.0.0.pom
diff --git a/osgi-annotation.spec b/osgi-annotation.spec
index 379d849..a6848d2 100644
--- a/osgi-annotation.spec
+++ b/osgi-annotation.spec
@@ -1,13 +1,13 @@
 Name:    osgi-annotation
-Version: 6.0.0
-Release: 8%{?dist}
+Version: 7.0.0
+Release: 1%{?dist}
 Summary: Annotations for use in compiling OSGi bundles
 
 License: ASL 2.0
 URL:     http://www.osgi.org/
 # Upstream project is behind an account registration system with no anonymous
 # read access, so we download the source from maven central instead
-Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}-sources.jar
+Source0: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.jar
 Source1: http://repo1.maven.org/maven2/org/osgi/osgi.annotation/%{version}/osgi.annotation-%{version}.pom
 
 BuildArch:     noarch
@@ -28,8 +28,10 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -c -q
 
-mkdir -p src/main/resources && mv about.html src/main/resources
-mkdir -p src/main/java && mv org src/main/java
+mkdir -p src/main/java && mv OSGI-OPT/src/org src/main/java
+
+rm -r org OSGI-OPT
+
 cp -p %{SOURCE1} pom.xml
 
 # Ensure OSGi metadata is generated
@@ -61,7 +63,8 @@ cp -p %{SOURCE1} pom.xml
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE
+%license LICENSE
+%doc about.html
 %dir %{_javadir}/osgi-annotation
 %dir %{_mavenpomdir}/osgi-annotation
 
@@ -69,6 +72,9 @@ cp -p %{SOURCE1} pom.xml
 %doc LICENSE
 
 %changelog
+* Tue Nov 20 2018 Marian Koncek <mkoncek@redhat.com> - 7.0.0-1
+- Update to upstream version 7.0.0
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 6.0.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 1d12e1c..0eaa286 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-22a0b460ecbe689f7482c9ec651a7169  osgi.annotation-6.0.0.pom
-aacd0d2a65e9d181a28b3ae4bcd3b8bf  osgi.annotation-6.0.0-sources.jar
+SHA512 (osgi.annotation-7.0.0.jar) = b976bceed56e88854550318f21e71c2812b220d1b86dd3f4d34b4319b983b9c659cba2d29f044efaa243af5775cc4f9d2283bf60836b7632ce8f6bc396325c2c
+SHA512 (osgi.annotation-7.0.0.pom) = 6bfa35e1cd81a2e659061ec6b65fde0f048bce9b247424897bf18cf822b9d397f8dece42064f96cdacfe72c744408832210cdb9bf96f49e57f73af957ed3f991