diff --git a/NOTICE-CC-BY.txt b/NOTICE-CC-BY.txt
new file mode 100644
index 0000000..c9eff0b
--- /dev/null
+++ b/NOTICE-CC-BY.txt
@@ -0,0 +1,4 @@
+Copyright (c) 2005 Brian Goetz
+Released under the Creative Commons Attribution License
+  (http://creativecommons.org/licenses/by/2.5)
+Official home: http://www.jcip.net
diff --git a/jsr-305-0.1.tar.bz2 b/jsr-305-0.1.tar.bz2
deleted file mode 100644
index 7a2100c..0000000
--- a/jsr-305-0.1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d6ec4fe52382a39ecdd87ecb66e7e10bf433082602153e33017e71fea698a92f
-size 9009
diff --git a/jsr-305-20130910svn.tgz b/jsr-305-20130910svn.tgz
new file mode 100644
index 0000000..cc6d9b4
--- /dev/null
+++ b/jsr-305-20130910svn.tgz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cc848a5aa60cb6e3fe0cc677df766a915057de11ac07940af3ba4471ee739517
+size 38557
diff --git a/jsr-305.changes b/jsr-305.changes
index 5387a30..4f7023d 100644
--- a/jsr-305.changes
+++ b/jsr-305.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct 25 06:58:50 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Update to newer snapshot (svn revision 51)
+- Add com.google.code.findbugs:jsr305 alias to the maven provides
+
 -------------------------------------------------------------------
 Tue Sep 19 09:49:18 UTC 2017 - fstrba@suse.com
 
diff --git a/jsr-305.spec b/jsr-305.spec
index 8ecd3ea..b6b7e05 100644
--- a/jsr-305.spec
+++ b/jsr-305.spec
@@ -12,54 +12,58 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
+%global svn_revision 51
+%global svn_date 20130910
 Name:           jsr-305
-Version:        0.1
+Version:        0.1+%{svn_date}
 Release:        0
-Summary:        JSR 305: Annotations for Software Defect Detection in Java
-# http://groups.google.com/group/jsr-305/browse_thread/thread/8105869a258c8c4f
+Summary:        Correctness annotations for Java code
+# The majority of code is BSD-licensed, but some Java sources
+# are licensed under CC-BY license, see: $ grep -r Creative .
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 Url:            http://code.google.com/p/jsr-305/
-# svn export -r20080806 http://jsr-305.googlecode.com/svn/trunk/ jsr-305-0.1
-# tar cjf jsr-305-0.1.bz2 jsr-305-0.1
-Source0:        jsr-305-0.1.tar.bz2
+# There has been no official release yet.  This is a snapshot of the Subversion
+# repository as of 10 Sep 2013.  Use the following commands to generate the
+# tarball:
+#   svn export -r %{svn_revision} http://%{name}.googlecode.com/svn/trunk %{name}
+#   tar -czvf %{name}-%{svn_date}svn.tgz %{name}
+Source0:        jsr-305-%{svn_date}svn.tgz
 Source1:        jsr-305-ri-build.xml
-# bnc#653551
-# The URL reffers to New BSD License - used <OWNER> == Bill Pugh, <YEAR> == 2008
-Source2:        license
+# File containing URL to CC-BY license text
+Source2:        NOTICE-CC-BY.txt
 BuildRequires:  ant
+BuildRequires:  dos2unix
 BuildRequires:  fdupes
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
-Provides:       jsr305 = %{version}-%{release}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
-%description
-This project contains reference implementations, test cases, and other
-documents under source code control for Java Specification Request 305:
-Annotations for Software Defect Detection. More information at the Google
-group: http://groups.google.com/group/jsr-305.
-
 %package javadoc
-Summary:        Javadoc for %{name}
-Group:          Documentation/HTML
+Summary:        Javadoc documentation for %{name}
+Group:          Development/Libraries/Java
+
+%description
+This package contains reference implementations, test cases, and other
+documents for Java Specification Request 305: Annotations for Software Defect
+Detection.
 
 %description javadoc
-This project contains reference implementations, test cases, and other
-documents under source code control for Java Specification Request 305:
-Annotations for Software Defect Detection. More information at the Google
-group: http://groups.google.com/group/jsr-305.
+This package contains the API documentation for %{name}.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 cp -a %{SOURCE1} ri/build.xml
-cp %{SOURCE2} .
+cp %{SOURCE2} NOTICE-CC-BY
+dos2unix sampleUses/pom.xml
+
+# do not build sampleUses module - it causes Javadoc generation to fail
+%pom_disable_module sampleUses
 
 %build
 export OPT_JAR_LIST=:
@@ -77,8 +81,8 @@ ln -s %{name}-%{version}.jar %{buildroot}%{_javadir}/jsr305.jar
 
 # poms
 mkdir -p %{buildroot}%{_mavenpomdir}
-cp -a ri/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap
+cp -a ri/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar -a com.google.code.findbugs:jsr305
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}
@@ -87,14 +91,19 @@ cp -a ri/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
-%doc license
+%doc ri/LICENSE NOTICE-CC-BY sampleUses
 %{_javadir}/%{name}.jar
 %{_javadir}/jsr305.jar
 %{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
 %{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
+%doc ri/LICENSE NOTICE-CC-BY
 %{_javadocdir}/%{name}
 
 %changelog
diff --git a/license b/license
deleted file mode 100644
index 62773ba..0000000
--- a/license
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright (c) 2008, Bill Pugh
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of the Bill Pugh nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-         
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.