diff --git a/cdemu-client-1.5.0.tar.bz2 b/cdemu-client-1.5.0.tar.bz2
deleted file mode 100644
index c38d763..0000000
--- a/cdemu-client-1.5.0.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d4d7e3d232f799830c1c480d69f8789468552602e2737b0b0207f4d449095f99
-size 97987
diff --git a/cdemu-client-2.0.0.tar.bz2 b/cdemu-client-2.0.0.tar.bz2
new file mode 100644
index 0000000..7e02b43
--- /dev/null
+++ b/cdemu-client-2.0.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6238bea426258859069b382e018bf3d299d79fea6e3fc126e6d907f25a2de0d
+size 28328
diff --git a/cdemu-client.changes b/cdemu-client.changes
index 932152a..e7ba29b 100644
--- a/cdemu-client.changes
+++ b/cdemu-client.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sat Dec 22 08:23:15 UTC 2012 - jengelh@inai.de
+
+- Update to new upstream release 2.0.0 (up from 1.5.0)
+* Support for ISZ, CSO, DMG, GBI, ECM, gzip and xz formats
+* Partial support for 1-track MDX
+- Remove cdemu-lang.diff, no longer applies
+
 -------------------------------------------------------------------
 Wed Dec 19 13:35:50 UTC 2012 - jengelh@inai.de
 
diff --git a/cdemu-client.spec b/cdemu-client.spec
index d4d2735..1549a41 100644
--- a/cdemu-client.spec
+++ b/cdemu-client.spec
@@ -17,7 +17,7 @@
 
 
 Name:           cdemu-client
-Version:        1.5.0
+Version:        2.0.0
 Release:        0
 Summary:        Command-line client to control cdemu-daemon
 License:        GPL-2.0+
@@ -25,14 +25,20 @@ Group:          System/Filesystems
 Url:            http://cdemu.sf.net/
 
 #Freecode-URL:	https://freecode.com/projects/cdemu-for-linux
+#Git-Clone:	git://git.code.sf.net/p/cdemu/code
 Source:         http://downloads.sf.net/cdemu/%name-%version.tar.bz2
-Patch1:         cdemu-lang.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#BuildRequires:	autoconf >= 2.59
-BuildRequires:  intltool
+BuildRequires:  cmake >= 2.8.5
+%if 0%{?suse_version}
+BuildRequires:  gettext-tools >= 0.15
+%else
+BuildRequires:  gettext >= 0.15
+%endif
+BuildRequires:  intltool >= 0.21
+BuildRequires:  python >= 2.6
 BuildArch:      noarch
 Requires:       dbus-1-python
-Requires:       python
+Requires:       python >= 2.6
 
 %description
 cdemu-client is a command-line client for controlling cdemu-daemon.
@@ -42,24 +48,24 @@ CDEmu daemon, such as loading and unloading devices, displaying
 devices' status and retrieving/setting their debug masks.
 
 %prep
-%setup -q
-mv po/no.po po/nb_NO.po
-%patch -P 1 -p1
+%setup -Tcqa0
+mv po/no.po po/nb_NO.po;
 
 %build
-%configure
+cmake . -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \
+	-DCMAKE_INSTALL_LIBDIR:PATH="%_libdir";
 make %{?_smp_mflags};
 
 %install
 b="%buildroot";
 make install DESTDIR="$b";
-%find_lang %name
+%find_lang cdemu
 
-%files -f %name.lang
+%files -f cdemu.lang
 %defattr(-,root,root)
 %doc README
 %dir %_sysconfdir/bash_completion.d
-%config %_sysconfdir/bash_completion.d/cdemu-bashcomp
+%config %_sysconfdir/bash_completion.d/cdemu-client
 %_bindir/cdemu
 %_datadir/applications/cdemu-client.desktop
 %_mandir/man1/cdemu.1*
diff --git a/cdemu-lang.diff b/cdemu-lang.diff
deleted file mode 100644
index 6e95b8d..0000000
--- a/cdemu-lang.diff
+++ /dev/null
@@ -1,31 +0,0 @@
----
- configure    |    2 +-
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: cdemu-client-1.5.0/configure
-===================================================================
---- cdemu-client-1.5.0.orig/configure
-+++ cdemu-client-1.5.0/configure
-@@ -4236,7 +4236,7 @@ fi
- 
- 
- # Internationalization
--ALL_LINGUAS="de fr no sl sv pl"
-+ALL_LINGUAS="de fr nb_NO sl sv pl"
- 
- GETTEXT_PACKAGE=cdemu-client
- 
-Index: cdemu-client-1.5.0/configure.ac
-===================================================================
---- cdemu-client-1.5.0.orig/configure.ac
-+++ cdemu-client-1.5.0/configure.ac
-@@ -20,7 +20,7 @@ AM_MAINTAINER_MODE
- AC_PROG_INTLTOOL([0.21])
- 
- # Internationalization
--ALL_LINGUAS="de fr no sl sv pl"
-+ALL_LINGUAS="de fr nb_NO sl sv pl"
- 
- GETTEXT_PACKAGE=cdemu-client
- AC_SUBST(GETTEXT_PACKAGE)