diff --git a/debian/changelog b/debian/changelog
index 0f11f41..ec444aa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+paraview (3.14.1-7) unstable; urgency=low
+
+  [ Anton Gladky ]
+  * [fd77b28] Add missing epoch in libavformat-dev version. 
+              Thanks to Jakub Wilk. 
+              http://lists.debian.org/debian-devel/2012/07/msg00086.html
+  * [155d23c] Use compat 9 to harden buildflags.
+  * [bdef31b] Add -Wall -pedantic -Wl,--as-needed to buildflags.
+
+  [ Julien Cristau ]
+  * [8feb118] Restrict shlibs to depend on the upstream version. 
+              (Closes: #680359)
+
+ -- Anton Gladky <gladky.anton@gmail.com>  Fri, 13 Jul 2012 20:56:41 +0200
+
 paraview (3.14.1-6) unstable; urgency=low
 
   * [6183021] Install ParaViewUse.cmake.
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index e12e914..fd08e81 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ DM-Upload-Allowed: yes
 Uploaders: Christophe Prud'homme <prudhomm@debian.org>, 
  Mathieu Malaterre <mathieu.malaterre@gmail.com>, 
  Anton Gladky <gladky.anton@gmail.com>
-Build-Depends: debhelper (>= 8), cmake (>= 2.6.3), 
+Build-Depends: debhelper (>= 9), cmake (>= 2.6.3), 
  libqt4-dev (>= 4.3.3-2), libsqlite3-dev,
  qt4-dev-tools, libboost-all-dev, 
- libavformat-dev (>= 0.7.1),
+ libavformat-dev (>= 4:0.7.1),
  libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, python-support, 
  libglu1-mesa-dev, libxt-dev, python-all, 
  python-all-dev (>= 2.7), python-all-dev (<< 2.8),
diff --git a/debian/rules b/debian/rules
index e1c868e..b47b1b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,21 +3,15 @@
 
 DESTDIR = $(CURDIR)/debian/tmp
 
+UPSTREAM_VERSION = $(shell dpkg-parsechangelog | awk '/^Version:/ { sub("-[^-]*$$", "", $$2); print $$2}')
+
 %:
 	dh $@ --with python2 --parallel
 
 export LD_LIBRARY_PATH+=:$(CURDIR)/debian/paraview/usr/lib/paraview
 
-# http://lists.alioth.debian.org/pipermail/debian-science-maintainers/2011-June/008157.html
-# cmake will inspect those settings automatically:
-export CFLAGS := -Wall $(shell dpkg-buildflags --get CFLAGS)
-export CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
-export CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
-export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-
-# CMAKE_SKIP_RPATH=OFF is important otherwise documentation generation will fails with:
-# vtkSMExtractDocumentation: error while loading shared libraries: libvtkPVServerManager.so:
-# No rule to make target `Documentation/ParaViewWriters.html', needed by `Documentation/paraview.qhp'.  Stop.
+export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
 # Explicit settings of MPI_* is required see
 # http://www.vtk.org/Bug/view.php?id=12572
@@ -73,3 +67,6 @@ override_dh_auto_install:
 
 override_dh_install:
 	dh_install --list-missing
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V'paraview (>= $(UPSTREAM_VERSION)), paraview (<< $(UPSTREAM_VERSION).)'