diff --git a/debian/changelog b/debian/changelog
index 20a923a2..335ad2ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,12 @@ llvm-toolchain-3.8 (1:3.8.1-2) unstable; urgency=medium
     cover the CMake build system too
   (Closes: #819072)
 
+  [ Pablo Oliveira ]
+  * Fix python-lldb dependencies and make proper symlinks to libLLVM
+    and liblldb as suggested by Graham Inggs (Closes: #821022)
+  * Fix liblldb suffix in lldb/scripts/Python/finishSwigPythonLLDB.py
+    (Closes: #813798)
+
  --
 
 llvm-toolchain-3.8 (1:3.8.1-1) UNRELEASED; urgency=medium
diff --git a/debian/control b/debian/control
index 938c7f8e..4350049f 100644
--- a/debian/control
+++ b/debian/control
@@ -395,7 +395,7 @@ Description: Next generation, high-performance debugger, debugging libraries
 Package: python-lldb-3.8
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, liblldb-3.8, lldb-3.8, python
 Conflicts: python-lldb-3.4, python-lldb-3.5, python-lldb-3.6, python-lldb-3.7
 Pre-Depends: ${misc:Pre-Depends}
 Description: Next generation, high-performance debugger, python lib
diff --git a/debian/liblldb-X.Y.links.in b/debian/liblldb-X.Y.links.in
index bea86baa..a222fbc6 100644
--- a/debian/liblldb-X.Y.links.in
+++ b/debian/liblldb-X.Y.links.in
@@ -1,4 +1,3 @@
 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so
-usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so         usr/lib/python2.7/dist-packages/lldb-@LLVM_VERSION@/_lldb.so
 usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1       usr/lib/llvm-@LLVM_VERSION@/lib/liblldb.so.1
 
diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb-soname.diff
index f702e06f..13979b0a 100644
--- a/debian/patches/lldb-soname.diff
+++ b/debian/patches/lldb-soname.diff
@@ -54,3 +54,16 @@
  endif()
  
  if (LLDB_WRAP_PYTHON)
+
+--- a/lldb/scripts/Python/finishSwigPythonLLDB.py
++++ b/lldb/scripts/Python/finishSwigPythonLLDB.py
+@@ -378,7 +378,7 @@
+             if eOSType == utilsOsType.EnumOsType.Darwin:
+                 strLibFileExtn = ".dylib"
+             else:
+-                strLibFileExtn = "so"
++                strLibFileExtn = "-3.8.so.1"
+             strSrc = os.path.join("lib", "liblldb" + strLibFileExtn)
+ 
+     bOk, strErrMsg = make_symlink(vDictArgs, vstrFrameworkPythonDir, strSrc, strTarget)
+
diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh
index 8745c3b4..b604fd92 100644
--- a/debian/prepare-new-release.sh
+++ b/debian/prepare-new-release.sh
@@ -9,7 +9,7 @@ for F in $LIST; do
     TARGET=`echo $F|sed -e "s|$ORIG_VERSION|$TARGET_VERSION|g"`
     svn mv $F $TARGET
 done
-LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff`
+LIST=`ls debian/*$TARGET_VERSION* debian/control debian/*.install debian/*.links debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/lldb-soname.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff`
 for F in $LIST; do
     sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F
     sed -i -e "s|$ORIG_VERSION|$TARGET_VERSION|g" $F
diff --git a/debian/python-lldb-X.Y.links.in b/debian/python-lldb-X.Y.links.in
index f3eb99bb..bce077f7 100644
--- a/debian/python-lldb-X.Y.links.in
+++ b/debian/python-lldb-X.Y.links.in
@@ -1,5 +1,6 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1  usr/lib/python2.7/dist-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/libLLVM-@LLVM_VERSION_FULL@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-@LLVM_VERSION_FULL@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/libLLVM-@LLVM_VERSION@.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/liblldb-@LLVM_VERSION@.so.1      usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/_lldb.so
 usr/lib/llvm-@LLVM_VERSION@/lib/python2.7/site-packages/lldb/ usr/lib/python2.7/dist-packages/lldb
 
 
diff --git a/debian/rules b/debian/rules
index 68204e17..e0ac9a0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -411,8 +411,8 @@ endif
 # Change CMake module dir
 	sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake/LLVMConfig.cmake
 
-# Managed in lldb-X.Y.links.in
-	rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so
+# Managed in python-lldb-X.Y.links.in
+	rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/_lldb.so
 
 # Manage the polly files. Sometimes, we build them. Sometimes not.
 	if test "$(POLLY_ENABLE)" = yes; then \