diff --git a/libx86emu-1.14.tar.xz b/libx86emu-1.14.tar.xz
deleted file mode 100644
index 96c777f..0000000
--- a/libx86emu-1.14.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f21ee6e8e2c2a014d2b9140b25ac283ed886074f107558d7eefd71db2c4913cf
-size 83556
diff --git a/libx86emu-2.0.tar.xz b/libx86emu-2.0.tar.xz
new file mode 100644
index 0000000..315c70d
--- /dev/null
+++ b/libx86emu-2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:ff27a8fc1380c5c06239bdd1f8131218dcb9f3eb171e2fd40ba1d80653d2a828
+size 84216
diff --git a/libx86emu.changes b/libx86emu.changes
index fb88378..c1286b2 100644
--- a/libx86emu.changes
+++ b/libx86emu.changes
@@ -1,3 +1,10 @@
+--------------------------------------------------------------------
+Wed Jul 25 08:42:44 UTC 2018 - wfeldt@opensuse.org
+
+- merge gh#wfeldt/libx86emu#12
+- fstirlitz: make libx86emu re-entrant
+- 2.0
+
 --------------------------------------------------------------------
 Fri Apr 27 12:22:24 UTC 2018 - wfeldt@opensuse.org
 
diff --git a/libx86emu.spec b/libx86emu.spec
index 1415389..d45246b 100644
--- a/libx86emu.spec
+++ b/libx86emu.spec
@@ -24,7 +24,7 @@ BuildRequires:  xz
 Summary:        A small x86 emulation library.
 License:        BSD-3-Clause
 Group:          System/Libraries
-Version:        1.14
+Version:        2.0
 Release:        0
 PreReq:         /sbin/ldconfig
 Source:         %{name}-%{version}.tar.xz
@@ -41,11 +41,11 @@ Authors:
 --------
     Steffen Winterfeldt
 
-%package -n     libx86emu1
+%package -n     libx86emu2
 Summary:        A small x86 emulation library.
 Group:          System/Libraries
 
-%description -n libx86emu1
+%description -n libx86emu2
 Small x86 emulation library with focus of easy usage and extended
 execution logging functions.
 
@@ -58,7 +58,7 @@ Authors:
 %package -n     libx86emu-devel
 Summary:        A small x86 emulation library.
 Group:          System/Libraries
-Requires:       libx86emu1 = %version
+Requires:       libx86emu2 = %version
 
 %description -n libx86emu-devel
 Small x86 emulation library with focus of easy usage and extended
@@ -80,11 +80,11 @@ make LIBDIR=%{_libdir}
 install -d -m 755 %{buildroot}%{_libdir}
 make install DESTDIR=%{buildroot} LIBDIR=%{_libdir}
 
-%post -n libx86emu1 -p /sbin/ldconfig
+%post -n libx86emu2 -p /sbin/ldconfig
 
-%postun -n libx86emu1 -p /sbin/ldconfig
+%postun -n libx86emu2 -p /sbin/ldconfig
 
-%files -n libx86emu1
+%files -n libx86emu2
 %defattr(-,root,root)
 %{_libdir}/*.so.*
 %doc README.md LICENSE*