diff --git a/libzrtpcpp-1.6.0.tar.bz2 b/libzrtpcpp-1.6.0.tar.bz2
deleted file mode 100644
index 7e83028..0000000
--- a/libzrtpcpp-1.6.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f23bede7665a5b99aa979b0b784c2218789417cb3a42bbc77b487d77a0c044c2
-size 328876
diff --git a/libzrtpcpp-2.0.0.tar.bz2 b/libzrtpcpp-2.0.0.tar.bz2
new file mode 100644
index 0000000..5ffb5e4
--- /dev/null
+++ b/libzrtpcpp-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:87d1372207eda4f583fa9623d54d62a5d8d777fa00584d5f9d20e5e23be092d1
+size 162336
diff --git a/libzrtpcpp.changes b/libzrtpcpp.changes
index dfd4068..d98b630 100644
--- a/libzrtpcpp.changes
+++ b/libzrtpcpp.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Sep 27 08:02:08 UTC 2011 - coolo@suse.com
+
+- fix the shared library policy packaging
+
+-------------------------------------------------------------------
+Sat Aug 20 07:17:04 UTC 2011 - Werner.Dittmann@t-online.de
+
+- Modify and rename spec file to adhere to naming policies
+  * remove rpmlintrc file - not longer used
+
+-------------------------------------------------------------------
+Mon Aug  1 15:54:33 UTC 2011 - Werner.Dittmann@t-online.de
+
+- update to version 2.0 to be in sync with version number of GNU ccRTP
+  * Update configuration to use the new GNU uCommon library
+
 -------------------------------------------------------------------
 Sat Jan  8 09:10:00 MEZ 2011 - Werner.Dittmann@t-online.de
 
diff --git a/libzrtpcpp.spec b/libzrtpcpp.spec
index 2fbf254..27b6895 100644
--- a/libzrtpcpp.spec
+++ b/libzrtpcpp.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libzrtpcpp (Version 1.6.0)
+# spec file for package libzrtpcpp
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,16 +18,19 @@
 
 
 Name:           libzrtpcpp
-Summary:        A ccrtp extension for ZRTP support
-BuildRequires:  cmake gcc-c++ libgcrypt-devel pkgconfig
-BuildRequires:  libccrtp-devel >= 1.8.0
-Version:        1.6.0
-Release:        1
+%define lname libzrtpcpp2
+Version:        2.0.0
+Release:        0
 License:        GPLv3+
-Group:          Development/Libraries/Other
+Summary:        A ccrtp extension for ZRTP support
 Url:            http://www.gnu.org/software/commoncpp/commoncpp.html
-Source0:        %{name}-%{version}.tar.bz2
-Source1:        rpmlintrc
+Group:          Development/Libraries/Other
+Source0:        libzrtpcpp-%{version}.tar.bz2
+BuildRequires:  cmake
+BuildRequires:  gcc-c++
+BuildRequires:  ccrtp-devel >= 2.0.0
+BuildRequires:  libopenssl-devel >= 0.9.8
+BuildRequires:  pkgconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -36,40 +39,26 @@ that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
 encryption, and which can be directly embedded into telephony
 applications.
 
+%package -n %lname
+Summary:        A ccrtp extension for ZRTP support
 
+%description -n %lname
 This library is a GPL licensed extension to the GNU RTP Stack, ccrtp,
 that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
 encryption, and which can be directly embedded into telephony
 applications.
 
-
-
-%description -n libzrtpcpp
-This library is a GPL licensed extension to the GNU RTP Stack, ccrtp,
-that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
-encryption, and which can be directly embedded into telephony
-applications.
-
-
-This library is a GPL licensed extension to the GNU RTP Stack, ccrtp,
-that offers compatibility with Phil Zimmermann's zrtp/Zfone voice
-encryption, and which can be directly embedded into telephony
-applications.
-
-
-
 %package devel
 License:        GPLv3+
+Summary:        Headers and link library for libzrtpcpp
 Group:          Development/Libraries/Other
-Summary:        Headers and static link library for libzrtpcpp
-Requires:       libzrtpcpp = %{version} libccrtp-devel
+Requires:       ccrtp-devel >= 2.0.0
+Requires:       %{lname} = %{version}
 
 %description devel
 This package provides the header files, link libraries, and
 documentation for building applications that use libzrtpcpp.
 
-
-
 %prep
 %setup -q
 
@@ -81,20 +70,21 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DSYSCONFDIR=%{_sysconfdir} \
       -DMANDIR=%{_mandir} \
       -DCMAKE_VERBOSE_MAKEFILE=TRUE \
-      -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-      -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-      ..  
+      -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \
+      -DCMAKE_CXX_FLAGS_RELEASE:STRING="%{optflags}" \
+      ..
 
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 cd build
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+%make_install
 
 %clean
-rm -rf "$RPM_BUILD_ROOT"
+rm -rf %{buildroot}
 
-%files -n libzrtpcpp
+%files -n %lname
 %defattr(-,root,root,0755)
 %doc AUTHORS COPYING README
 %{_libdir}/*.so.*
@@ -106,8 +96,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %{_includedir}/libzrtpcpp/*.h
 %dir %{_includedir}/libzrtpcpp
 
-%post -n libzrtpcpp -p /sbin/ldconfig
+%post -p /sbin/ldconfig -n %lname
 
-%postun -n libzrtpcpp -p /sbin/ldconfig
+%postun -p /sbin/ldconfig -n %lname
 
 %changelog
diff --git a/rpmlintrc b/rpmlintrc
deleted file mode 100644
index 03b15a8..0000000
--- a/rpmlintrc
+++ /dev/null
@@ -1 +0,0 @@
-addFilter("shlib-policy-name-error .*")