diff --git a/baselibs.conf b/baselibs.conf
index e1271ed..9d50555 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,5 @@
 libtheora0
   obsoletes "libtheora-<targettype> <= <version>"
   provides "libtheora-<targettype> = <version>"
+libtheoradec1
+libtheoraenc1
diff --git a/libtheora.changes b/libtheora.changes
index 6008b3f..95e7371 100644
--- a/libtheora.changes
+++ b/libtheora.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Aug 30 11:29:11 UTC 2014 - jengelh@inai.de
+
+- Split libtheoradec/enc from libtheora0 as they have different
+  SO numbers
+- Trim huge description; improve on RPM group classificaiton
+
 -------------------------------------------------------------------
 Thu May 23 14:27:51 UTC 2013 - idonmez@suse.com
 
diff --git a/libtheora.spec b/libtheora.spec
index 87291e7..ecc41df 100644
--- a/libtheora.spec
+++ b/libtheora.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package libtheora
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,51 +17,36 @@
 
 
 Name:           libtheora
-BuildRequires:  gcc-c++
-BuildRequires:  libogg-devel
-BuildRequires:  libtool
-BuildRequires:  libvorbis-devel
-BuildRequires:  pkg-config
-BuildRequires:  python
-Url:            http://www.theora.org/
 Summary:        Theora video compression codec
 License:        BSD-3-Clause
 Group:          Productivity/Multimedia/Other
 Version:        1.1.1
 Release:        0
 %define pkg_version %version
+Url:            http://www.theora.org/
+
+Source:         http://downloads.xiph.org/releases/theora/%{name}-%{pkg_version}.tar.bz2
+Source2:        baselibs.conf
+BuildRequires:  gcc-c++
+BuildRequires:  libogg-devel
+BuildRequires:  libtool
+BuildRequires:  libvorbis-devel
+BuildRequires:  pkg-config
+BuildRequires:  python
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # bug437293
 %ifarch ppc64
 Obsoletes:      libtheora-64bit
 %endif
-#
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         http://downloads.xiph.org/releases/theora/%{name}-%{pkg_version}.tar.bz2
-Source2:        baselibs.conf
 
 %description
 Theora is a free and open video compression format from the Xiph.org Foundation. Like all our 
 multimedia technology it can be used to distribute film and video online and on disc without 
 the licensing and royalty fees or vendor lock-in associated with other formats.
 
-Theora scales from postage stamp to HD resolution, and is considered particularly competitive 
-at low bitrates. It is in the same class as MPEG-4/DiVX, and like the Vorbis audio codec it 
-has lots of room for improvement as encoder technology develops.
-
-Theora is in full public release as of November 3, 2008. The bitstream format for Theora I 
-was frozen Thursday, 2004 July 1. All bitstreams encoded since that date will remain compatible 
-with future releases.
-
-The package contains the library that can decode and encode Theora streams. Theora is also 
-able to playback VP3 streams.
-
-Authors:
---------
-    the Xiph.Org Foundation http://www.xiph.org/
-
 %package -n libtheora0
 Summary:        Theora video compression codec
-Group:          Productivity/Multimedia/Other
+Group:          System/Libraries
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} <= %{version}
 # bug437293
@@ -90,11 +75,35 @@ Authors:
 --------
     the Xiph.Org Foundation http://www.xiph.org/
 
+%package -n libtheoradec1
+Summary:        Theora video decompression library
+Group:          System/Libraries
+
+%description -n libtheoradec1
+Theora is a free and open video compression format from the Xiph.org Foundation. Like all our 
+multimedia technology it can be used to distribute film and video online and on disc without 
+the licensing and royalty fees or vendor lock-in associated with other formats.
+
+This subpackage contains the decoder library.
+
+%package -n libtheoraenc1
+Summary:        Theora video compression library
+Group:          System/Libraries
+
+%description -n libtheoraenc1
+Theora is a free and open video compression format from the Xiph.org Foundation. Like all our 
+multimedia technology it can be used to distribute film and video online and on disc without 
+the licensing and royalty fees or vendor lock-in associated with other formats.
+
+This subpackage contains the encoder library.
+
 %package devel
 Summary:        Theora video compression codec
 Group:          Development/Libraries/C and C++
 Requires:       libogg-devel
 Requires:       libtheora0 = %{version}
+Requires:       libtheoradec1 = %{version}
+Requires:       libtheoraenc1 = %{version}
 # bug437293
 %ifarch ppc64
 Obsoletes:      libtheora-devel-64bit
@@ -129,10 +138,10 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
 %configure --disable-examples \
     --disable-static \
     --with-pic
-%{__make} %{?jobs:-j%jobs} docdir=%{_docdir}/%{name}
+make %{?_smp_mflags} docdir=%{_docdir}/%{name}
 
 %install
-%makeinstall docdir=%{_docdir}/%{name}
+%make_install docdir=%{_docdir}/%{name}
 %{__install} -d $RPM_BUILD_ROOT%{_bindir}
 # Install remaining parts of documentation.
 %{__cp} -a AUTHORS CHANGES COPYING LICENSE README $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -140,17 +149,23 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
 %check
 %{__make} check
 
-%clean
-%{__rm} -rf $RPM_BUILD_ROOT
-
-%post -n libtheora0 -p /sbin/ldconfig
-
+%post   -n libtheora0 -p /sbin/ldconfig
 %postun -n libtheora0 -p /sbin/ldconfig
+%post   -n libtheoradec1 -p /sbin/ldconfig
+%postun -n libtheoradec1 -p /sbin/ldconfig
+%post   -n libtheoraenc1 -p /sbin/ldconfig
+%postun -n libtheoraenc1 -p /sbin/ldconfig
 
 %files -n libtheora0
 %defattr(-,root,root)
 %{_libdir}/libtheora.so.0*
+
+%files -n libtheoradec1
+%defattr(-,root,root)
 %{_libdir}/libtheoradec.so.1*
+
+%files -n libtheoraenc1
+%defattr(-,root,root)
 %{_libdir}/libtheoraenc.so.1*
 
 %files devel