diff --git a/debian/changelog b/debian/changelog
index 39d0f6c..f1826c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+qwt (6.1.2-5.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Override dh_makeshlibs to strip debian revision from symbols version.
+    Also don't fail on symbols changes, common for C++ projects.
+    (closes: #835755)
+  * Update symbols for amd64.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 04 Sep 2016 20:09:20 +0200
+
 qwt (6.1.2-5.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/libqwt-qt5-6.symbols b/debian/libqwt-qt5-6.symbols
index 709efe0..9e1385e 100644
--- a/debian/libqwt-qt5-6.symbols
+++ b/debian/libqwt-qt5-6.symbols
@@ -10,7 +10,7 @@ libqwt-qt5.so.6 libqwt-qt5-6 #MINVER#
  (optional=templinst|arch=arm64 armel armhf hppa powerpc ppc64 ppc64el s390x sparc64)_Z16qwtBoundingRectTI10QwtPoint3DE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI12QwtSetSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI13QwtOHLCSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
- (optional=templinst|arch=arm64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 powerpc ppc64 ppc64el s390x sparc64)_Z16qwtBoundingRectTI13QwtPointPolarE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
+ (optional=templinst|arch=amd64 arm64 armel armhf hppa hurd-i386 i386 kfreebsd-i386 powerpc ppc64 ppc64el s390x sparc64)_Z16qwtBoundingRectTI13QwtPointPolarE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI17QwtIntervalSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst|arch=!mips !mipsel)_Z16qwtBoundingRectTI7QPointFE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst|arch=!amd64 !hppa !kfreebsd-amd64 !mips64el !ppc64 !ppc64el !s390x !x32)_Z17qRegisterMetaTypeI10QwtGraphicEiPKcPT_N9QtPrivate21MetaTypeDefinedHelperIS3_Xaasr12QMetaTypeId2IS3_E7DefinedntsrS8_9IsBuiltInEE11DefinedTypeE@Base 6.1.2
diff --git a/debian/libqwt6abi1.symbols b/debian/libqwt6abi1.symbols
index 4464ae3..6e6c52c 100644
--- a/debian/libqwt6abi1.symbols
+++ b/debian/libqwt6abi1.symbols
@@ -10,7 +10,7 @@ libqwt.so.6abi1 libqwt6abi1 #MINVER#
  (optional=templinst|arch=!hurd-i386 !i386 !kfreebsd-i386 !mips !mipsel !powerpc)_Z16qwtBoundingRectTI10QwtPoint3DE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI12QwtSetSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI13QwtOHLCSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
- (optional=templinst|arch=arm64 armel armhf hurd-i386 i386 kfreebsd-i386 powerpc ppc64el sparc64)_Z16qwtBoundingRectTI13QwtPointPolarE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
+ (optional=templinst|arch=amd64 arm64 armel armhf hurd-i386 i386 kfreebsd-i386 powerpc ppc64el sparc64)_Z16qwtBoundingRectTI13QwtPointPolarE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst)_Z16qwtBoundingRectTI17QwtIntervalSampleE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  (optional=templinst|arch=!mips !mipsel)_Z16qwtBoundingRectTI7QPointFE6QRectFRK13QwtSeriesDataIT_Eii@Base 6.1.2
  _Z19qwtNormalizeDegreesd@Base 6.1.2
diff --git a/debian/rules b/debian/rules
index bf2b883..b56121e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildfla
 export CPPFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS  := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
 
+UPSTREAM_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
+
 %:
 	dh $@ --parallel --list-missing --with pkgkde_symbolshelper
 
@@ -52,3 +54,6 @@ override_dh_installdocs:
 
 override_dh_compress:
 	dh_compress --exclude=.cpp --exclude=.pri --exclude=.xpm
+
+override_dh_makeshlibs:
+	dh_makeshlibs -- -c0 -v$(UPSTREAM_VERSION)