diff -Nru tomcat8-8.0.32/debian/changelog tomcat8-8.0.32/debian/changelog
--- tomcat8-8.0.32/debian/changelog	2016-02-10 07:19:08.000000000 -0800
+++ tomcat8-8.0.32/debian/changelog	2016-02-17 08:45:51.000000000 -0800
@@ -1,3 +1,12 @@
+tomcat8 (8.0.32-1ubuntu1) xenial; urgency=medium
+
+  * Promote tomcat8 to main (LP: #1539903).
+    - Remove build-dependencies on libobjenesis-java and
+      libeasymock-java, and skip tests that rely on the functionality
+      they provide.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Fri, 05 Feb 2016 09:20:39 +0100
+
 tomcat8 (8.0.32-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru tomcat8-8.0.32/debian/control tomcat8-8.0.32/debian/control
--- tomcat8-8.0.32/debian/control	2016-02-10 07:18:00.000000000 -0800
+++ tomcat8-8.0.32/debian/control	2016-02-17 08:42:07.000000000 -0800
@@ -14,12 +14,10 @@
 Build-Depends-Indep: javahelper,
                      junit4 (>= 4.11),
                      libcglib3-java,
-                     libeasymock-java (>= 3.0),
                      libecj-java (>= 3.10.0),
                      libhamcrest-java (>= 1.3),
                      libjakarta-taglibs-standard-java,
                      libjstl1.1-java,
-                     libobjenesis-java,
                      lsb-release,
                      maven-repo-helper
 Standards-Version: 3.9.7
diff -Nru tomcat8-8.0.32/debian/patches/0021-ubuntu-mainize-build-xml.patch tomcat8-8.0.32/debian/patches/0021-ubuntu-mainize-build-xml.patch
--- tomcat8-8.0.32/debian/patches/0021-ubuntu-mainize-build-xml.patch	1969-12-31 16:00:00.000000000 -0800
+++ tomcat8-8.0.32/debian/patches/0021-ubuntu-mainize-build-xml.patch	2016-02-17 08:45:51.000000000 -0800
@@ -0,0 +1,63 @@
+Description: Remove build dependencies on packages from Ubuntu universe
+ In order to promote tomcat8 to Ubuntu main, we have to restrict its
+ build dependencies to only packages in main already. Currently, that is
+ two packages used only for testing, libobjenesis-java and
+ libeasymock-java.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+
+---
+
+Bug-Ubuntu: https://launchpad.net/bugs/1539903
+Last-Update: <2016-02-17>
+
+Index: gitwd/build.xml
+===================================================================
+--- gitwd.orig/build.xml
++++ gitwd/build.xml
+@@ -210,9 +210,7 @@
+     <pathelement location="${test.classes}"/>
+     <pathelement location="${junit.jar}"/>
+     <pathelement location="${hamcrest.jar}"/>
+-    <pathelement location="${easymock.jar}"/>
+     <pathelement location="${cglib.jar}"/>
+-    <pathelement location="${objenesis.jar}"/>
+     <path refid="compile.classpath" />
+     <path refid="tomcat.classpath" />
+   </path>
+@@ -1322,6 +1320,11 @@
+            encoding="ISO-8859-1"
+            includeantruntime="true">
+       <classpath refid="tomcat.test.classpath" />
++      <!-- Exclude tests that depend on easymock and objenesis -->
++      <exclude name="org/apache/catalina/filters/TestRestCsrfPreventionFilter.java" />
++      <exclude name="org/apache/catalina/realm/TestJNDIRealm.java" />
++      <exclude name="org/apache/catalina/startup/TestWebappServiceLoader.java" />
++      <exclude name="org/apache/jasper/servlet/TestTldScanner.java" />
+       <include name="org/apache/**" />
+       <include name="javax/**" />
+       <include name="util/**" />
+@@ -2809,24 +2812,12 @@ skip.installer property in build.propert
+       <param name="destdir" value="${hamcrest.home}"/>
+     </antcall>
+ 
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${easymock.loc}"/>
+-      <param name="destfile" value="${easymock.jar}"/>
+-      <param name="destdir" value="${base.path}"/>
+-    </antcall>
+-
+     <antcall target="downloadfile">
+       <param name="sourcefile" value="${cglib.loc}"/>
+       <param name="destfile" value="${cglib.jar}"/>
+       <param name="destdir" value="${cglib.home}"/>
+     </antcall>
+ 
+-    <antcall target="downloadzip">
+-      <param name="sourcefile" value="${objenesis.loc}"/>
+-      <param name="destfile" value="${objenesis.jar}"/>
+-      <param name="destdir" value="${base.path}"/>
+-    </antcall>
+-
+   </target>
+ 
+   <target name="download-cobertura"
diff -Nru tomcat8-8.0.32/debian/patches/series tomcat8-8.0.32/debian/patches/series
--- tomcat8-8.0.32/debian/patches/series	2016-02-10 07:08:36.000000000 -0800
+++ tomcat8-8.0.32/debian/patches/series	2016-02-17 08:45:51.000000000 -0800
@@ -12,3 +12,4 @@
 0018-fix-manager-webapp.patch
 0019-add-distribution-to-error-page.patch
 #0020-disable-java8-support-with-jdtcompiler.patch
+0021-ubuntu-mainize-build-xml.patch