diff --git a/debian/control b/debian/control
index ea52ddf..b8417bd 100644
--- a/debian/control
+++ b/debian/control
@@ -73,11 +73,13 @@ Description: RDP client for Windows Terminal Services (X11 client)
  .
  This package contains the X11 based client.
 
-Package: libfreerdp2
+Package: libfreerdp2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libfreerdp2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Suggests: freerdp2-x11
 Description: Free Remote Desktop Protocol library (core library)
@@ -86,11 +88,13 @@ Description: Free Remote Desktop Protocol library (core library)
  .
  This package contains the shared library with all core functionality.
 
-Package: libfreerdp-client2
+Package: libfreerdp-client2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libfreerdp-client2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Description: Free Remote Desktop Protocol library (client library)
  FreeRDP is a libre client/server implementation of the Remote
@@ -98,11 +102,13 @@ Description: Free Remote Desktop Protocol library (client library)
  .
  This package contains the shared library for common client functionality.
 
-Package: libfreerdp-server2
+Package: libfreerdp-server2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libfreerdp-server2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Description: Free Remote Desktop Protocol library (server library)
  FreeRDP is a libre client/server implementation of the Remote
@@ -110,11 +116,13 @@ Description: Free Remote Desktop Protocol library (server library)
  .
  This package contains the shared library with common server functionality.
 
-Package: libwinpr2
+Package: libwinpr2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libwinpr2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Suggests: freerdp2-x11
 Description: Windows Portable Runtime library
@@ -129,11 +137,13 @@ Description: Windows Portable Runtime library
  .
  This package contains the WinPR shared library.
 
-Package: libwinpr-tools2
+Package: libwinpr-tools2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libwinpr-tools2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Description: Windows Portable Runtime Tools library
  FreeRDP is a libre client/server implementation of the Remote
@@ -149,8 +159,8 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  libssl-dev,
- libwinpr2 (= ${binary:Version}),
- libwinpr-tools2 (= ${binary:Version}),
+ libwinpr2-2 (= ${binary:Version}),
+ libwinpr-tools2-2 (= ${binary:Version}),
 Description: Windows Portable Runtime library (development files)
  WinPR is a spin-off project of FreeRDP which aims at providing a portable
  implementation of important portions of the Windows API. Just like FreeRDP,
@@ -170,10 +180,10 @@ Multi-Arch: same
 Depends:
  ${misc:Depends},
  libwinpr2-dev (= ${binary:Version}),
- libfreerdp2 (= ${binary:Version}),
- libfreerdp-server2 (= ${binary:Version}),
- libfreerdp-client2 (= ${binary:Version}),
- libfreerdp-shadow2 (= ${binary:Version}),
+ libfreerdp2-2 (= ${binary:Version}),
+ libfreerdp-server2-2 (= ${binary:Version}),
+ libfreerdp-client2-2 (= ${binary:Version}),
+ libfreerdp-shadow2-2 (= ${binary:Version}),
  winpr-utils (= ${binary:Version}),
 Description: Free Remote Desktop Protocol library (development files)
  FreeRDP is a libre client/server implementation of the Remote
@@ -198,11 +208,13 @@ Description: Windows Portable Runtime library command line utilities
  .
  This package contains WinPR command line utils (winpr-hash, winpr-makecert).
 
-Package: libfreerdp-shadow2
+Package: libfreerdp-shadow2-2
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends},
+Breaks: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Description: FreeRDP Remote Desktop Protocol shadow libraries
  FreeRDP is a libre client/server implementation of the Remote
@@ -210,6 +222,20 @@ Description: FreeRDP Remote Desktop Protocol shadow libraries
  .
  This package contains the shadow libraries.
 
+Package: libfreerdp-shadow-subsystem2-2
+Architecture: any
+Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libfreerdp-shadow2 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Multi-Arch: same
+Description: FreeRDP Remote Desktop Protocol shadow subsystem libraries
+ FreeRDP is a libre client/server implementation of the Remote
+ Desktop Protocol (RDP).
+ .
+ This package contains the shadow subsystem libraries.
+
 Package: freerdp2-shadow-x11
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -221,11 +247,13 @@ Description: FreeRDP x11 shadowing server
  This package contains a "shadowing" server that can be used to
  share an already started X11 DISPLAY.
 
-Package: libuwac0
+Package: libuwac0-0
 Architecture: any
 Section: libs
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
+Replaces: libuwac0 (<< 2.0.0~git20170725.1.1648deb+dfsg1-1~),
 Multi-Arch: same
 Description: Using wayland as a client library
  Using wayland as a client (uwac) is a library to provide common
@@ -239,7 +267,7 @@ Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
- libuwac0 (= ${binary:Version}),
+ libuwac0-0 (= ${binary:Version}),
 Description: Using wayland as a client (development files)
  Using wayland as a client (uwac) is a library to provide common
  functionality for wayland clients.
diff --git a/debian/libfreerdp-client2.install b/debian/libfreerdp-client2-2.install
similarity index 100%
rename from debian/libfreerdp-client2.install
rename to debian/libfreerdp-client2-2.install
diff --git a/debian/libfreerdp-client2.symbols b/debian/libfreerdp-client2-2.symbols
similarity index 98%
rename from debian/libfreerdp-client2.symbols
rename to debian/libfreerdp-client2-2.symbols
index f7b8c1e..b92a65b 100644
--- a/debian/libfreerdp-client2.symbols
+++ b/debian/libfreerdp-client2-2.symbols
@@ -1,4 +1,4 @@
-libfreerdp-client2.so.2 libfreerdp-client2 #MINVER#
+libfreerdp-client2.so.2 libfreerdp-client2-2 #MINVER#
  client_cli_authenticate@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  client_cli_gw_authenticate@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  client_cli_verify_certificate@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libfreerdp-client2.lintian-overrides b/debian/libfreerdp-client2.lintian-overrides
deleted file mode 100644
index 74d5967..0000000
--- a/debian/libfreerdp-client2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libfreerdp-client2: package-name-doesnt-match-sonames libfreerdp-client2-2
diff --git a/debian/libfreerdp-server2.install b/debian/libfreerdp-server2-2.install
similarity index 100%
rename from debian/libfreerdp-server2.install
rename to debian/libfreerdp-server2-2.install
diff --git a/debian/libfreerdp-server2-2.lintian-overrides b/debian/libfreerdp-server2-2.lintian-overrides
new file mode 100644
index 0000000..5044b17
--- /dev/null
+++ b/debian/libfreerdp-server2-2.lintian-overrides
@@ -0,0 +1,2 @@
+# the RDP protocol throws an error containing the word UNKOWN... So it is not us who cannot spell...
+libfreerdp-server2-2: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libfreerdp-server.so.2.0.0 UNKOWN UNKNOWN
diff --git a/debian/libfreerdp-server2.symbols b/debian/libfreerdp-server2-2.symbols
similarity index 97%
rename from debian/libfreerdp-server2.symbols
rename to debian/libfreerdp-server2-2.symbols
index 1d0ca50..9019cd5 100644
--- a/debian/libfreerdp-server2.symbols
+++ b/debian/libfreerdp-server2-2.symbols
@@ -1,4 +1,4 @@
-libfreerdp-server2.so.2 libfreerdp-server2 #MINVER#
+libfreerdp-server2.so.2 libfreerdp-server2-2 #MINVER#
  audin_server_context_free@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  audin_server_context_new@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  cliprdr_server_context_free@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libfreerdp-server2.lintian-overrides b/debian/libfreerdp-server2.lintian-overrides
deleted file mode 100644
index c0f33cc..0000000
--- a/debian/libfreerdp-server2.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# the RDP protocol throws an error containing the word UNKOWN... So it is not us who cannot spell...
-libfreerdp-server2: spelling-error-in-binary usr/lib/x86_64-linux-gnu/libfreerdp-server.so.2.0.0 UNKOWN UNKNOWN
-libfreerdp-server2: package-name-doesnt-match-sonames libfreerdp-server2-2
diff --git a/debian/libfreerdp-shadow-subsystem2-2.install b/debian/libfreerdp-shadow-subsystem2-2.install
new file mode 100644
index 0000000..f8c8d66
--- /dev/null
+++ b/debian/libfreerdp-shadow-subsystem2-2.install
@@ -0,0 +1 @@
+usr/lib/*/libfreerdp-shadow-subsystem*.so.*
diff --git a/debian/libfreerdp-shadow-subsystem2-2.symbols b/debian/libfreerdp-shadow-subsystem2-2.symbols
new file mode 100644
index 0000000..fb5a520
--- /dev/null
+++ b/debian/libfreerdp-shadow-subsystem2-2.symbols
@@ -0,0 +1,3 @@
+libfreerdp-shadow-subsystem2.so.2 libfreerdp-shadow-subsystem2-2 #MINVER#
+ X11_ShadowSubsystemEntry@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
+ shadow_subsystem_set_entry_builtin@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libfreerdp-shadow2-2.install b/debian/libfreerdp-shadow2-2.install
new file mode 100644
index 0000000..a1584b2
--- /dev/null
+++ b/debian/libfreerdp-shadow2-2.install
@@ -0,0 +1 @@
+usr/lib/*/libfreerdp-shadow2*.so.*
diff --git a/debian/libfreerdp-shadow2.symbols b/debian/libfreerdp-shadow2-2.symbols
similarity index 84%
rename from debian/libfreerdp-shadow2.symbols
rename to debian/libfreerdp-shadow2-2.symbols
index 517735a..3412354 100644
--- a/debian/libfreerdp-shadow2.symbols
+++ b/debian/libfreerdp-shadow2-2.symbols
@@ -1,7 +1,4 @@
-libfreerdp-shadow-subsystem2.so.2 libfreerdp-shadow2 #MINVER#
- X11_ShadowSubsystemEntry@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
- shadow_subsystem_set_entry_builtin@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
-libfreerdp-shadow2.so.2 libfreerdp-shadow2 #MINVER#
+libfreerdp-shadow2.so.2 libfreerdp-shadow2-2 #MINVER#
  shadow_capture_align_clip_rect@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  shadow_capture_compare@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  shadow_client_boardcast_msg@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libfreerdp-shadow2.install b/debian/libfreerdp-shadow2.install
deleted file mode 100644
index dfb16ad..0000000
--- a/debian/libfreerdp-shadow2.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libfreerdp-shadow*.so.*
diff --git a/debian/libfreerdp-shadow2.lintian-overrides b/debian/libfreerdp-shadow2.lintian-overrides
deleted file mode 100644
index 3f2cd4e..0000000
--- a/debian/libfreerdp-shadow2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libfreerdp-shadow2: package-name-doesnt-match-sonames libfreerdp-shadow-subsystem2-2 libfreerdp-shadow2-2
diff --git a/debian/libfreerdp2.install b/debian/libfreerdp2-2.install
similarity index 100%
rename from debian/libfreerdp2.install
rename to debian/libfreerdp2-2.install
diff --git a/debian/libfreerdp2.symbols b/debian/libfreerdp2-2.symbols
similarity index 99%
rename from debian/libfreerdp2.symbols
rename to debian/libfreerdp2-2.symbols
index 4e44a29..777d57b 100644
--- a/debian/libfreerdp2.symbols
+++ b/debian/libfreerdp2-2.symbols
@@ -1,4 +1,4 @@
-libfreerdp2.so.2 libfreerdp2 #MINVER#
+libfreerdp2.so.2 libfreerdp2-2 #MINVER#
  Bitmap_Alloc@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  Bitmap_SetDimensions@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  Bitmap_SetRectangle@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libfreerdp2.lintian-overrides b/debian/libfreerdp2.lintian-overrides
deleted file mode 100644
index bab29bb..0000000
--- a/debian/libfreerdp2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libfreerdp2: package-name-doesnt-match-sonames libfreerdp2-2
diff --git a/debian/libuwac0.install b/debian/libuwac0-0.install
similarity index 100%
rename from debian/libuwac0.install
rename to debian/libuwac0-0.install
diff --git a/debian/libuwac0.symbols b/debian/libuwac0-0.symbols
similarity index 98%
rename from debian/libuwac0.symbols
rename to debian/libuwac0-0.symbols
index bd9e824..3e6d9f4 100644
--- a/debian/libuwac0.symbols
+++ b/debian/libuwac0-0.symbols
@@ -1,4 +1,4 @@
-libuwac0.so.0 libuwac0 #MINVER#
+libuwac0.so.0 libuwac0-0 #MINVER#
  UwacCloseDisplay@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  UwacCreateWindowShm@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  UwacDestroyWindow@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libuwac0.lintian-overrides b/debian/libuwac0.lintian-overrides
deleted file mode 100644
index 196d691..0000000
--- a/debian/libuwac0.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libuwac0: package-name-doesnt-match-sonames libuwac0-0
diff --git a/debian/libwinpr-tools2.install b/debian/libwinpr-tools2-2.install
similarity index 100%
rename from debian/libwinpr-tools2.install
rename to debian/libwinpr-tools2-2.install
diff --git a/debian/libwinpr-tools2.symbols b/debian/libwinpr-tools2-2.symbols
similarity index 89%
rename from debian/libwinpr-tools2.symbols
rename to debian/libwinpr-tools2-2.symbols
index bd39dcf..1b4b41a 100644
--- a/debian/libwinpr-tools2.symbols
+++ b/debian/libwinpr-tools2-2.symbols
@@ -1,4 +1,4 @@
-libwinpr-tools2.so.2 libwinpr-tools2 #MINVER#
+libwinpr-tools2.so.2 libwinpr-tools2-2 #MINVER#
  makecert_context_free@Base 2.0.0~git20160503.1.f828595+dfsg1
  makecert_context_new@Base 2.0.0~git20160503.1.f828595+dfsg1
  makecert_context_output_certificate_file@Base 2.0.0~git20160503.1.f828595+dfsg1
diff --git a/debian/libwinpr-tools2.lintian-overrides b/debian/libwinpr-tools2.lintian-overrides
deleted file mode 100644
index 6bbc056..0000000
--- a/debian/libwinpr-tools2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libwinpr-tools2: package-name-doesnt-match-sonames libwinpr-tools2-2
diff --git a/debian/libwinpr2.install b/debian/libwinpr2-2.install
similarity index 100%
rename from debian/libwinpr2.install
rename to debian/libwinpr2-2.install
diff --git a/debian/libwinpr2.symbols b/debian/libwinpr2-2.symbols
similarity index 99%
rename from debian/libwinpr2.symbols
rename to debian/libwinpr2-2.symbols
index 1d4945a..43ee5af 100644
--- a/debian/libwinpr2.symbols
+++ b/debian/libwinpr2-2.symbols
@@ -1,4 +1,4 @@
-libwinpr2.so.2 libwinpr2 #MINVER#
+libwinpr2.so.2 libwinpr2-2 #MINVER#
  ASN1DecSetError@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  ASN1EncSetError@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
  ASN1_CloseEncoder@Base 2.0.0~git20160317.1.75ae3f5+dfsg1
diff --git a/debian/libwinpr2.lintian-overrides b/debian/libwinpr2.lintian-overrides
deleted file mode 100644
index 20d1b74..0000000
--- a/debian/libwinpr2.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libwinpr2: package-name-doesnt-match-sonames libwinpr2-2
diff --git a/debian/rules b/debian/rules
index 7dccacd..c0218dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,17 +59,18 @@ override_dh_install:
 	dh_install --fail-missing
 
 override_dh_strip:
-	dh_strip -plibfreerdp2 --dbgsym-migration='libfreerdp2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibfreerdp-server2 --dbgsym-migration='libfreerdp-server2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibfreerdp-shadow2 --dbgsym-migration='libfreerdp-shadow2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibfreerdp-client2 --dbgsym-migration='libfreerdp-client2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibwinpr2 --dbgsym-migration='libwinpr2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibwinpr-tools2 --dbgsym-migration='libwinpr-tools2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibfreerdp2-2 --dbgsym-migration='libfreerdp2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibfreerdp-server2-2 --dbgsym-migration='libfreerdp-server2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibfreerdp-shadow2-2 --dbgsym-migration='libfreerdp-shadow2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibfreerdp-shadow-subsystem2-2 --dbgsym-migration='libfreerdp-shadow2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibfreerdp-client2-2 --dbgsym-migration='libfreerdp-client2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibwinpr2-2 --dbgsym-migration='libwinpr2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibwinpr-tools2-2 --dbgsym-migration='libwinpr-tools2-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
 	dh_strip -pfreerdp2-x11 --dbgsym-migration='freerdp2-x11-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
 	dh_strip -pfreerdp2-shadow-x11 --dbgsym-migration='freerdp2-shadow-x11-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
 	dh_strip -pwinpr-utils --dbgsym-migration='winpr-utils-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
 	dh_strip -pfreerdp2-wayland --dbgsym-migration='freerdp2-wayland-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
-	dh_strip -plibuwac0 --dbgsym-migration='libuwac0-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
+	dh_strip -plibuwac0-0 --dbgsym-migration='libuwac0-dbg (<< 2.0.0~git20161130.1.e60d0d5+dfsg1-1~exp1~)'
 
 PKD   = $(word 1,$(abspath $(dir $(MAKEFILE_LIST))))
 PKG   = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))