diff --git a/baselibs.conf b/baselibs.conf
new file mode 100644
index 0000000..7599ddc
--- /dev/null
+++ b/baselibs.conf
@@ -0,0 +1 @@
+libcodec2-0_8
diff --git a/codec2-0.7.tar.xz b/codec2-0.7.tar.xz
deleted file mode 100644
index 413872e..0000000
--- a/codec2-0.7.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0695bb93cd985dd39f02f0db35ebc28a98b9b88747318f90774aba5f374eadb2
-size 8386048
diff --git a/codec2-0.8.1.tar.xz b/codec2-0.8.1.tar.xz
new file mode 100644
index 0000000..fb5e393
--- /dev/null
+++ b/codec2-0.8.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a07cdaacf59c3f7dbb1c63b769d443af486c434b3bd031fb4edd568ce3e613d6
+size 8868212
diff --git a/codec2-no_return_random.patch b/codec2-no_return_random.patch
new file mode 100644
index 0000000..597e794
--- /dev/null
+++ b/codec2-no_return_random.patch
@@ -0,0 +1,12 @@
+Index: codec2-0.8.1/src/gp_interleaver.c
+===================================================================
+--- codec2-0.8.1.orig/src/gp_interleaver.c
++++ codec2-0.8.1/src/gp_interleaver.c
+@@ -74,6 +74,7 @@ int choose_interleaver_b(int Nbits)
+     /* if we get it means a Nbits we dont have in our table so choke */
+     
+     assert(0);
++    return(0);
+ }
+ 
+ 
diff --git a/codec2.changes b/codec2.changes
index b8f8c33..49b11ba 100644
--- a/codec2.changes
+++ b/codec2.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Jul 17 11:08:45 UTC 2018 - mpluskal@suse.com
+
+- Update to version 0.8.1:
+  * No upstream changelog provided
+- Add codec2-no_return_random.patch
+- Add baselibs.conf
+
 -------------------------------------------------------------------
 Mon Jul 31 23:55:03 UTC 2017 - wk@ire.pw.edu.pl
 
diff --git a/codec2.spec b/codec2.spec
index 05de8b4..168feea 100644
--- a/codec2.spec
+++ b/codec2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package codec2
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,20 @@
 #
 
 
-%define libname lib%{name}-0_7
+%define libname lib%{name}-0_8
 Name:           codec2
-Version:        0.7
+Version:        0.8.1
 Release:        0
 Summary:        Low bit rate speech codec
 # octave and asterisk directories contain GPL-2.0 licensed code but its not
-# used build, only used in examples subpackage. src/horus_l2.* is not free
-# for non-commercial usage but is not used either.
-License:        LGPL-2.1
+# used build, only used in examples subpackage.
+License:        LGPL-2.1-only
 Group:          Productivity/Hamradio/Other
-Url:            http://rowetel.com/codec2.html
-Source:         http://files.freedv.org/codec2/codec2-%{version}.tar.xz
+URL:            http://rowetel.com/codec2.html
+Source:         https://hobbes1069.fedorapeople.org/freetel/codec2/codec2-%{version}.tar.xz
 Source1:        %{name}-rpmlintrc
+Source2:        baselibs.conf
+Patch0:         codec2-no_return_random.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig
@@ -42,7 +43,7 @@ between 700 and 3200 bit/s.
 
 %package -n %{libname}
 Summary:        Low bit rate speech codec
-License:        LGPL-2.1
+License:        LGPL-2.1-only
 Group:          System/Libraries
 
 %description -n %{libname}
@@ -51,7 +52,7 @@ between 700 and 3200 bit/s.
 
 %package devel
 Summary:        Development library for codec2
-License:        GPL-2.0 AND LGPL-2.1
+License:        GPL-2.0-only AND LGPL-2.1-only
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
 
@@ -61,7 +62,7 @@ between 700 and 3200 bit/s.
 
 %package examples
 Summary:        Example code for Codec 2
-License:        GPL-2.0 AND LGPL-2.1
+License:        GPL-2.0-only AND LGPL-2.1-only
 Group:          Productivity/Hamradio/Other
 Requires:       %{name}-devel = %{version}
 BuildArch:      noarch
@@ -71,16 +72,14 @@ Example code for Codec 2, including test voices and matlab/octave files.
 
 %prep
 %setup -q
-# horus_l2.* is not needed for building and has to be removed due to
-# licensing reasons
-rm -rf src/horus_l2.*
+%patch0 -p1
 
 %build
 %cmake \
   -DINSTALL_EXAMPLES=TRUE \
   -DUNITTEST=TRUE \
   -Wno-dev
-make %{?_smp_mflags}
+%make_jobs
 
 %install
 %cmake_install
@@ -105,8 +104,8 @@ EOF
 %postun -n %{libname} -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root)
-%doc COPYING README README_fdmdv.txt
+%license COPYING
+%doc README README_fdmdv.txt
 %{_bindir}/c2dec
 %{_bindir}/c2demo
 %{_bindir}/c2enc
@@ -125,17 +124,14 @@ EOF
 %{_bindir}/insert_errors
 
 %files -n %{libname}
-%defattr(-,root,root)
 %{_libdir}/libcodec2.so.*
 
 %files devel
-%defattr(-, root, root)
 %{_includedir}/*
 %{_libdir}/libcodec2.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %files examples
-%defattr(-,root,root)
 %{_datadir}/%{name}/
 
 %changelog