diff --git a/debian/changelog b/debian/changelog
index 4b55e56f..f9eb306c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 llvm-toolchain-3.8 (1:3.8.1-19~exp2) experimental; urgency=medium
 
   * mark the first symbol as (optional) as it differs from ld and gold
+  * remove the empty llvm package (Closes: #858626)
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 25 Mar 2017 16:37:44 +0100
 
diff --git a/debian/control b/debian/control
index 61e2cf7b..71f59456 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ Uploaders: Sylvestre Ledru <sylvestre@debian.org>
 Build-Depends: debhelper (>= 9.0), flex, bison, dejagnu, tcl, expect,
     cmake, perl, libtool, chrpath, texinfo, sharutils, libffi-dev (>= 3.0.9),
     lsb-release, patchutils, diffstat, xz-utils, python-dev,
-    libedit-dev, swig, python-six, python-sphinx, ocaml-nox, binutils-dev,
+    libedit-dev, swig, python-six, python-sphinx, binutils-dev,
     libjsoncpp-dev,
-    lcov, procps, help2man, dh-ocaml, zlib1g-dev,
+    lcov, procps, help2man, zlib1g-dev,
     g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32]
 Build-Conflicts: oprofile, ocaml, libllvm-3.4-ocaml-dev, libllvm-3.5-ocaml-dev,
  libllvm-3.8-ocaml-dev
@@ -331,26 +331,6 @@ Description: Modular compiler and toolchain technologies, tools
  .
  This package provides tools for testing.
 
-Package: libllvm-3.8-ocaml-dev
-Section: ocaml
-Architecture: any
-Suggests: llvm-3.8-doc
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${ocaml:Depends}, llvm-3.8-dev (= ${binary:Version})
-Provides: ${ocaml:Provides}
-Description: Modular compiler and toolchain technologies, OCaml bindings
- LLVM is a collection of libraries and tools that make it easy to build
- compilers, optimizers, just-in-time code generators, and many other
- compiler-related programs.
- .
- LLVM uses a single, language-independent virtual instruction set both
- as an offline code representation (to communicate code between
- compiler phases and to run-time systems) and as the compiler internal
- representation (to analyze and transform programs). This persistent
- code representation allows a common set of sophisticated compiler
- techniques to be applied at compile-time, link-time, install-time,
- run-time, or "idle-time" (between program runs).
- .
- This package provides the OCaml bindings to develop applications using llvm.
 
 Package: llvm-3.8-doc
 Section: doc
diff --git a/debian/rules b/debian/rules
index 82469f3c..18c2aa77 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,8 +27,6 @@ DEB_HOST_GNU_TYPE   = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_ARCH_BITS  = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
 DEB_HOST_ARCH       = $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-OCAML_STDLIB_DIR    ?= $(shell ocamlc -where)
-
 LDFLAGS_EXTRA =
 CXXFLAGS_EXTRA = -std=c++0x -gsplit-dwarf
 CONFIGURE_EXTRA =
@@ -138,7 +136,7 @@ endif
 
 
 %:
-	dh $@ --with ocaml
+	dh $@
 
 
 
@@ -147,15 +145,10 @@ preconfigure:
 		f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \
 		echo "$$f => $$f2"; \
 		sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' \
-			-e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" \
 			-e "s|@LLVM_VERSION_FULL@|$(LLVM_VERSION_FULL)|g" \
 			-e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $$f > $$f2; \
 	done
 
-# Override this two targets. They are trying to manage the .in conversion for me
-override_dh_ocamlinit:
-override_dh_ocamlclean:
-
 override_dh_auto_configure: preconfigure
 	echo "Using gcc: "
 	$(CC) -v