diff --git a/debian/cmake-data.elpa b/debian/cmake-data.elpa
deleted file mode 100644
index 99bb09751..000000000
--- a/debian/cmake-data.elpa
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/cmake-mode-pkg.el
-Auxiliary/cmake-mode.el
diff --git a/debian/cmake-mode-pkg.el.in b/debian/cmake-mode-pkg.el.in
deleted file mode 100644
index d522e5303..000000000
--- a/debian/cmake-mode-pkg.el.in
+++ /dev/null
@@ -1,4 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "cmake-mode" "@VERSION@" "major-mode for editing CMake sources"
-	'((emacs "24.1"))
-)
diff --git a/debian/control b/debian/control
index 1d4c44157..f159acb8c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,6 @@ Build-Depends:
  qtbase5-dev <!pkg.cmake.bootstrap !pkg.cmake.nogui>,
  zlib1g-dev <!pkg.cmake.bootstrap>,
 Build-Depends-Indep:
- dh-elpa,
  dh-sequence-sphinxdoc,
 Rules-Requires-Root: no
 Standards-Version: 4.6.1
@@ -52,6 +51,7 @@ Recommends: gcc, make
 Suggests:
  cmake-doc,
  cmake-format,
+ elpa-cmake-mode,
  ninja-build,
 Description: ${source:Synopsis}
  ${source:Extended-Description}
@@ -60,7 +60,6 @@ Package: cmake-data
 Architecture: all
 Multi-Arch: foreign
 Depends:
- ${elpa:Depends},
  ${misc:Depends},
 Description: CMake data files (modules, templates and documentation)
  ${source:Extended-Description}
diff --git a/debian/elpa-test b/debian/elpa-test
deleted file mode 100644
index 97351bcef..000000000
--- a/debian/elpa-test
+++ /dev/null
@@ -1 +0,0 @@
-disable=yes
diff --git a/debian/rules b/debian/rules
index f39135f0e..353d26eb9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,16 +93,5 @@ override_dh_installdocs-indep:
 override_dh_sphinxdoc:
 	dh_sphinxdoc -pcmake-doc
 
-export ELPA_NAME = cmake-mode
-
-# Instead of dh --with=elpa, we manually add dh_elpa to the sequence.  This
-# way, we can restrict the dh-elpa dependency (which transitively depends on
-# emacs) to indep builds and avoid it for the more fragile port architectures
-execute_after_dh_install-indep: debian/cmake-mode-pkg.el
-	dh_elpa
-
-debian/cmake-mode-pkg.el: debian/cmake-mode-pkg.el.in
-	sed -e 's/@VERSION@/$(DEB_VERSION_UPSTREAM)/' $< > $@
-
 %:
 	dh $@ --builddirectory=Build