diff --git a/debian/libclang-common-3.5-dev.install b/debian/libclang-common-3.5-dev.install
index 78c8ccc4..f2b71cdb 100644
--- a/debian/libclang-common-3.5-dev.install
+++ b/debian/libclang-common-3.5-dev.install
@@ -1,4 +1,4 @@
-usr/lib/llvm-3.5/lib/clang/3.5/include
-#usr/lib/clang/3.5/include/         /usr/include/clang/3.5/
-usr/lib/llvm-3.5/lib/clang/3.5/lib
+usr/lib/llvm-3.5/lib/clang/3.5.0/include
+#usr/lib/clang/3.5.0/include/         /usr/include/clang/3.5/
+usr/lib/llvm-3.5/lib/clang/3.5.0/lib
 #usr/lib/clang/3.5/lib             /usr/lib/clang/3.5/
diff --git a/debian/libllvm3.5.install b/debian/libllvm3.5.install
deleted file mode 100644
index f917c7c6..00000000
--- a/debian/libllvm3.5.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/x86_64-linux-gnu/
diff --git a/debian/libllvm3.5.install.in b/debian/libllvm3.5.install.in
index 9c3500c4..a41c0f3d 100644
--- a/debian/libllvm3.5.install.in
+++ b/debian/libllvm3.5.install.in
@@ -1 +1 @@
-usr/lib/llvm-3.5/lib/libLLVM-3.5.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
+usr/lib/llvm-3.5/lib/libLLVM-3.5.0.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/
diff --git a/debian/llvm-3.5-dev.links.in b/debian/llvm-3.5-dev.links.in
index 9d164aed..b830551e 100644
--- a/debian/llvm-3.5-dev.links.in
+++ b/debian/llvm-3.5-dev.links.in
@@ -1,4 +1,5 @@
-usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1		usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.0.so.1		usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1
+usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.0.so.1         usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so
 usr/lib/@DEB_HOST_MULTIARCH@/libLLVM-3.5.so.1       usr/lib/llvm-3.5/lib/libLLVM-3.5.so
 usr/include/llvm-c-3.5/llvm-c usr/lib/llvm-3.5/include/llvm-c
 usr/include/llvm-3.5/llvm usr/lib/llvm-3.5/include/llvm
diff --git a/debian/rules b/debian/rules
index 8813c688..ea6fb553 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ TARGET_BUILD	:= build-llvm
 GCC_VERSION     := 4.8
 #$(shell dpkg-query -W -f '$${Version}' g++ | sed -rne 's,^([0-9]+:)?([0-9]+\.[0-9]+).*$$,\2,p')
 LLVM_VERSION	:= 3.5
+LLVM_VERSION_FULL := $(LLVM_VERSION).0
 SONAME_EXT      := 1
 DEBIAN_REVISION := $(shell dpkg-parsechangelog | sed -rne 's,^Version: .*-(.*),\1,p')
 ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
@@ -247,7 +248,7 @@ override_dh_auto_install:
 	chrpath -d $(TARGET_BUILD)/Release/bin/clang
 	chrpath -d `find $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable`
 
-	mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION)*.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT)
+	mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION_FULL)*.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT)
 
 	if test $(LLDB_ENABLE) = yes; then \
 		mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.$(SONAME_EXT); \