diff -uNr a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -43,8 +43,13 @@
 
 Package: tomcat8
 Architecture: all
-Depends: adduser, lsb-base (>= 3.0-6), tomcat8-common (>= ${source:Version}), ucf, ${misc:Depends}
-Recommends: authbind, libtcnative-1 (>= 1.2.6~)
+Depends: adduser,
+         lsb-base (>= 3.0-6),
+         tomcat8-common (>= ${source:Version}),
+         ucf,
+         ${misc:Depends}
+Recommends: authbind,
+            libtcnative-1 (>= 1.2.6~)
 Suggests: tomcat8-admin (>= ${source:Version}),
           tomcat8-docs (>= ${source:Version}),
           tomcat8-examples (>= ${source:Version}),
@@ -63,7 +68,9 @@
 
 Package: tomcat8-user
 Architecture: all
-Depends: netcat, tomcat8-common (>= ${source:Version}), ${misc:Depends}
+Depends: netcat,
+         tomcat8-common (>= ${source:Version}),
+         ${misc:Depends}
 Suggests: tomcat8 (>= ${source:Version}),
           tomcat8-admin (>= ${source:Version}),
           tomcat8-docs (>= ${source:Version}),
@@ -79,8 +86,11 @@
 
 Package: libtomcat8-java
 Architecture: all
-Depends: libecj-java (>= 3.11.0), ${misc:Depends}
-Recommends: libcommons-dbcp-java, libcommons-pool-java
+Depends: libecj-java (>= 3.11.0),
+         libservlet3.1-java (>= ${source:Version}),
+         ${misc:Depends}
+Recommends: libcommons-dbcp-java,
+            libcommons-pool-java
 Suggests: tomcat8 (>= ${source:Version})
 Description: Apache Tomcat 8 - Servlet and JSP engine -- core libraries
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
@@ -92,7 +102,8 @@
 
 Package: libtomcat8-embed-java
 Architecture: all
-Depends: libecj-java (>= 3.11.0), ${misc:Depends}
+Depends: libecj-java (>= 3.11.0),
+         ${misc:Depends}
 Description: Apache Tomcat 8 - Servlet and JSP engine -- embed libraries
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
@@ -104,6 +115,7 @@
 Package: libservlet3.1-java
 Architecture: all
 Depends: ${misc:Depends}
+Suggests: libservlet3.1-java-doc (>= ${source:Version})
 Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API classes
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
@@ -115,7 +127,6 @@
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: libservlet3.1-java (>= ${source:Version})
 Description: Servlet 3.1, JSP 2.3, EL 3.0 and WebSocket 1.0 Java API documentation
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
@@ -125,7 +136,8 @@
 
 Package: tomcat8-admin
 Architecture: all
-Depends: tomcat8-common (>= ${source:Version}), ${misc:Depends}
+Depends: tomcat8-common (>= ${source:Version}),
+         ${misc:Depends}
 Description: Apache Tomcat 8 - Servlet and JSP engine -- admin web applications
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web
@@ -149,7 +161,8 @@
 Package: tomcat8-docs
 Section: doc
 Architecture: all
-Depends: tomcat8-common (>= ${source:Version}), ${misc:Depends}
+Depends: tomcat8-common (>= ${source:Version}),
+         ${misc:Depends}
 Description: Apache Tomcat 8 - Servlet and JSP engine -- documentation
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
  specifications from Oracle, and provides a "pure Java" HTTP web